Compare commits
64
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
32d7a63828 | ||
|
|
9970635f7e | ||
|
|
e53c5d0e92 | ||
|
|
e4266ae88c | ||
|
|
9a9fbce9b2 | ||
|
|
1bd7589fef | ||
|
|
1acfbd6374 | ||
|
|
aea6192ef9 | ||
|
|
53118bae19 | ||
|
|
beb2b06fdf | ||
|
|
4ebe098ef0 | ||
|
|
00db1cf5f2 | ||
|
|
477a5a46e3 | ||
|
|
2587d33c5a | ||
|
|
223655fe00 | ||
|
|
29959e2988 | ||
|
|
e14a864b37 | ||
|
|
cb1326688b | ||
|
|
ef652f3ada | ||
|
|
8180a8a302 | ||
|
|
c902ffbe9a | ||
|
|
de952a68d6 | ||
|
|
c85696080d | ||
|
|
7527800128 | ||
|
|
d36b6bcad0 | ||
|
|
5eac654c36 | ||
|
|
b26e2f2f62 | ||
|
|
9ac2f91dde | ||
|
|
e915aaa865 | ||
|
|
f21781f170 | ||
|
|
55a82fdc5f | ||
|
|
89500cbb5f | ||
|
|
63f3417f19 | ||
|
|
ca84bce24f | ||
|
|
b97556dcc1 | ||
|
|
07a9c1eaaf | ||
|
|
f8f2dd53aa | ||
|
|
2085ec770f | ||
|
|
d76475a1d7 | ||
|
|
99a708b40c | ||
|
|
9806ef8f66 | ||
|
|
aa6684b588 | ||
|
|
5a758ee3b6 | ||
|
|
b635432cff | ||
|
|
4cbca0b5a6 | ||
|
|
e39dc63ded | ||
|
|
4f741cd176 | ||
|
|
122bafcc7a | ||
|
|
8e486c1097 | ||
|
|
bb98fe66dd | ||
|
|
1f69480ed8 | ||
|
|
ffa7e84d43 | ||
|
|
46c3e72364 | ||
|
|
dd1fcea7e2 | ||
|
|
797a79c30e | ||
|
|
3415e010ff | ||
|
|
29c154d2ca | ||
|
|
877e3b4c76 | ||
|
|
b90a9bbfab | ||
|
|
747ce1add2 | ||
|
|
c823a4b92d | ||
|
|
aa760c2839 | ||
|
|
44b808b8e2 | ||
|
|
ec78dd722c |
No files matched your search
@@ -1,6 +1,3 @@
|
||||
# Keep the verified Windows source and binary assets byte-for-byte.
|
||||
# Do not normalize the r4 baseline's line endings during add/checkout.
|
||||
* -text
|
||||
# Normalize only these two reviewed Python files at the chain tip.
|
||||
src/cbb_refresh_verify/application.py text eol=lf
|
||||
src/cbb_refresh_verify/ui/main_window.py text eol=lf
|
||||
@@ -2,34 +2,19 @@
|
||||
|
||||
当前临时分支的备份策略(2026-11-03):应用不再自动备份中心库或 CBB 工程。新增、替换、移除、校验、ICDB 维护和恢复在执行前提示手动备份;请自行保留可用副本。导入暂存、恢复用隔离验证库和轻量操作证据仍会生成,Mentor 原生 Repair 自身的备份行为保持不变。详见[自动备份检查与调整](docs/releases/2026-11-03-manual-backup.md)。此条优先于下方历史版本的备份说明。
|
||||
|
||||
当前测试版本:**[0.2.4b3](docs/releases/v0.2.4-beta.3.md)(待现场验收)**。ICDB 批量检查在后台逐项运行,普通校验、管理和恢复可排队;READY 工程在实际执行前再次排除。检查不自动 Repair、Restore 或选择历史版本,也不代表中心库 READY。
|
||||
|
||||
管理写入因无法完成占用确认而未执行,或恢复安装前选择跳过,结果为 `SKIPPED`;取消为 `CANCELLED`,与实际操作失败区分。文件身份核对失败保留“需要恢复”,后续独立 CBB 依据各自会话释放和写前检查决定是否继续,不自动重放失败目标。
|
||||
|
||||
停止、超时或应用失联只停止后续原生动作,不结束正在 Save/Close 的调用进程。普通停止等待 5 秒,可能正在写入时最多等待 120 秒后交给后台观察;这不是强制结束时限。保存结果、关闭结果和资源释放分别记录。相关库等待释放,独立库可以排队继续;界面、筛选和日志保持可用。重启只核对未完成会话,不重放管理写操作。legacy 状态读取只观察已打开且匹配库的 LM,不启动 LM 或回答弹窗;无法读取保持 UNKNOWN。
|
||||
当前开发版本:**[v0.2.4-beta.1](docs/releases/v0.2.4-beta.1.md)(待评审、待现场验收)**。ICDB 批量检查在后台逐项运行,普通校验、管理和恢复可排队;READY 工程在实际执行前再次排除。检查不自动 Repair、Restore 或选择历史版本,也不代表中心库 READY。
|
||||
|
||||
历史释放记录会触发实际占用复核,确认释放后归档继续;会话释放不等于历史数据恢复。释放结果逐项保存;记录保存失败会单独显示,不把已确认释放的会话重新标成占用。可查看后台窗口的原生提示;仅对当前可识别的原生取消按钮提供确认操作。
|
||||
|
||||
自动流程不强杀原生会话;释放入口默认正常关闭。另有单独确认的“强制结束客户端”操作,仅限属于当前 Windows 用户和会话、归属及进程身份已确认的 PCB、Library Manager、DxDesigner/viewdraw、iCDB Project Backup 客户端。**ICDB 数据库服务器、后台导入器和归属未知的进程不允许强制结束**,即使命令指向当前库也不例外。客户端中其他已打开工程可能一并退出、未保存更改可能丢失;必须先记录确认名单,结束后重新证明库已释放,不能宣称数据库已修复。详见 [操作规程](SOP.md) 与 [版本说明](docs/releases/v0.2.4-beta.1.md)。下方日期记录为历史行为,以本说明为准。
|
||||
|
||||
本目录是独立的 CBB 检验、ICDB 维护和中心库管理工具,不属于 Part Replacement;管理入口接收已整理好的完整 PRJ/PCB 工程。
|
||||
|
||||
导入不运行 ASCII、CSV 或 EDIF 导出。新增/替换确认原生注册、目录复读、工程关联、顶层块及 Layout;顶层块允许保持来源名,或由原生导入改为本次 CBB 注册名,映射会单独记录。其余工程文件差异保留清单供核对,不以原生改写 PRJ 或运行历史判定导入失败。原生重写 ICDB 后不比较其原始字节,也不宣称已证明原理图语义等价。上传后自动校验可独立勾选,只有完整原生 Verify 和权威 READY 才显示校验通过。无效来源或已释放的单项失败逐项报告,不影响后续独立条目。
|
||||
本目录是独立的 CBB 中心库上传后校验工具,不属于 Part Replacement,也不负责 CBB 工程复制或中心库上传。
|
||||
|
||||
针对 `The last server session ... lost the connection to the database`,修复分支增加
|
||||
`ICDB_REPAIR_REQUIRED` 专项识别、共享符号库路径诊断及停止批次处理。现场原生修复步骤及实现边界见
|
||||
[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`,根因尚未定位;该导出已从普通导入流程移出,不能据此判定导入失败或 ICDB 损坏。
|
||||
- Windows 10、跨机器共享库和现场服务器会话失联的一致故障副本尚未验收。跨机器释放依赖 SMB 共享模式语义,目前没有跨机器实测证明。
|
||||
- 自动 ICDB Repair 保持关闭。共享库原生服务器若无法删除自身地址文件,或早停后仍有原生弹窗,需要继续核对;不以进程列表为空或端口不可达代替释放证明。
|
||||
- 验收文档中的本机路径、原始日志、截图、测试 XML 和冻结包不随 Git 分发;仓库保留说明及摘要,原始材料须在验收机器查看或另行归档。
|
||||
|
||||
## 功能边界
|
||||
|
||||
| 工具 | 处理对象 | 核心动作 | 结果 |
|
||||
@@ -162,7 +147,7 @@ python -m cbb_refresh_verify
|
||||
- **不注入鼠标或键盘输入,不切换 Windows 桌面,不改写中心库源文件。** 生产路径在本次运行创建的私有桌面内启动中心库目录绑定的 ReusableCircuit PCB,随后用 COM 完成刷新、保存和关闭;只读状态桥在结束后确认 LMC 的 READY。Library Manager 菜单派发仅作为显式诊断路径保留。`tests/test_safety.py` 会在离线测试中阻止真实输入注入 API 重新进入生产代码。
|
||||
- 所有自动化都跑在本进程创建的**私有 Windows 桌面**上:用户看不到窗口,光标不会被移动。
|
||||
- 弹窗只认领本次运行的私有桌面/进程,依据已知规则投递 `BM_CLICK`。数据库恢复、会话失联和设计锁接管提示会阻断并保留现场;不会自动选择恢复或接管。未知弹窗也会阻断,Project Integration 进度窗保持观察。动作/错误弹窗和实际控件 ID 写入 `dialogs.jsonl`。
|
||||
- 超时或失败时请求合作停止,保留可能正在原生调用的 worker 和保存/关闭助手,并交后台观察。内容检查超时同样不强杀进程树。保存结果未知时不再自动丢弃关闭;无保存助手且身份、空闲状态已确认的启动/集成失败仍可正常收尾。无法确认释放时保留 `recovery-required.json` 和相关库租约。
|
||||
- 超时或失败时停止自动化客户端,保留可能仍在写库的原生会话并停止批次。内容检查超时也不再强杀整个进程树;监督器核对进程是否退出,记录 `process_exit_confirmed` 或 `process_retained`;无法确认释放时输出 `recovery-required.json`,不以强杀代替数据库安全关闭。已确认身份且原生调用返回的失败文档会通过 32 位助手执行 `Close(False)`,再确认进程和 iCDB 地址释放。
|
||||
|
||||
## 环境要求
|
||||
|
||||
@@ -189,7 +174,7 @@ Windows 版本判断以 Build 为准:`22000` 及以上归为 Win11,`10240–
|
||||
|
||||
## 批量策略
|
||||
|
||||
每个 CBB 独立执行并写入自己的 evidence 和结果行。资源已释放的单项失败允许继续;未释放时跳过后续同库写入,独立库仍可运行。ICDB 错误本身不等于占用。用户取消或执行器明确返回 `QUEUE_STOP` 才停止本批次后续项,不自动恢复或重放该批次。
|
||||
每个 CBB 独立执行并写入自己的 evidence 和结果行。可确认安全的单项失败允许继续;遇到 `ICDB_REPAIR_REQUIRED`、超时、原生会话释放未确认等情况,会停止整批并把后续项目标为 `SKIPPED`。点击“当前项完成后停止”或执行器返回 `QUEUE_STOP` 也会停止队列。
|
||||
|
||||
GUI 中状态为 `绿色 / Ready` 的条目不能勾选、也不会进入批量队列。
|
||||
|
||||
@@ -224,9 +209,9 @@ Mentor 桥耗时需在目标机器另行测量。
|
||||
- `image-status-map.json`:按中心库路径隔离的本机动态 `image_id` 校准快照(当前格式 `schema_version=2`);旧版本或无版本缓存会自动忽略并重新校准,日志会记录当前样本、缓存样本、Ready 主 ID、未映射 ID 和逐项决策原因;
|
||||
- `backup/`:历史版本的辅助文件副本;当前分支不再生成,所有路径记录 `backup_skipped / manual_backup_policy`。已有历史副本不由本轮改动清理。
|
||||
|
||||
超时采用无进展计时:界面和批量请求默认 600 秒没有可观察进展时进入停止与观察流程,不强杀正在进行的调用。PCB/COM 阶段切换、Project Integration 状态变化、保存标记变化和弹窗处理都会刷新计时器;重复的状态轮询不算进展。需要更快失败时仍可调低单项预算,但 30 秒只适合已确认 PCB 启动稳定的环境。
|
||||
超时采用无进展计时:界面和批量请求默认 600 秒无进展超时;它不是整个 CBB 的固定总时限,而是连续 600 秒没有可观察进展时才终止。PCB/COM 阶段切换、Project Integration 状态变化、保存标记变化和弹窗处理都会刷新计时器;重复的状态轮询不算进展。需要更快失败时仍可在界面将单项预算调低,但 30 秒只适合已确认 PCB 启动稳定的环境。
|
||||
|
||||
结果不会把“内容检查 PASS”冒充为中心库绿色状态。默认权威桥读取 READY/raw=1;桥失败保留未知/不可用。显式 legacy 模式只观察已有匹配 LM 的树图标,图标不可读时保持 UNKNOWN,不以 Cert/Work 文件直接推断 READY 或 PENDING,也不自动回答原生提示。右键菜单文字(包括 `Unverify`)不参与状态判定。
|
||||
结果不会把“内容检查 PASS”冒充为中心库绿色状态:`library_flag` 只来自对条目状态的只读读取,读不到就是 `UNKNOWN`。Mentor 的树节点 `iImage` 是本机资源列表索引,不能跨安装固定写死为绿色;工具会在日志中为每个 CBB 记录 `image_id`,并从独立的 `Cert/Work` 持久化证据动态校准本机 ID。树 ID 可读时用于交叉核对,冲突不允许标记 Ready;LM 忙导致树 ID 暂时读不到时,完整的持久化证据仍可保留 Ready,缺少持久化证据的条目仍进入待校验。右键菜单文字(包括 `Unverify`)不参与状态判定。
|
||||
|
||||
### 状态接口审计
|
||||
|
||||
|
||||
@@ -15,12 +15,6 @@ python -m pytest -q
|
||||
python -m compileall -q src tests
|
||||
```
|
||||
|
||||
For an isolated checkout, set `$env:PYTHONPATH = (Resolve-Path ./src).Path` so
|
||||
test subprocesses import that checkout rather than another editable installation.
|
||||
The repository's `.gitattributes` preserves CRLF (`* -text`); use
|
||||
`git -c core.whitespace=cr-at-eol diff --check` to check whitespace in a clean
|
||||
clone without reporting the preserved CR bytes as trailing whitespace.
|
||||
|
||||
The source import was verified with 336 pytest cases. Tests use fake local files
|
||||
and replace the production Mentor COM/process boundary where required; they do
|
||||
not establish field success against a live network library.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# CBB 检查、校验、管理与残留释放操作规程
|
||||
|
||||
适用测试版本:0.2.4b3。测试版发布不代表现场验收,不自动关闭工单。以下为当前规程,下方旧上传校验检查表保留为历史参考。
|
||||
适用开发版本:0.2.4b1。未完成现场验收,不自动发布或关闭工单。以下为当前规程,下方旧上传校验检查表保留为历史参考。
|
||||
|
||||
## 当前操作与队列
|
||||
|
||||
@@ -8,20 +8,12 @@
|
||||
|
||||
普通校验完成原生打开、身份确认、Project Integration、保存和关闭后,必须由权威状态 READY/raw=1 确认成功。ICDB 检查仅尝试打开并检查本次错误,不自动 Repair、Restore 或选择版本,CHECKED 不等于 READY。排队期间变成 READY 的工程在执行前跳过。
|
||||
|
||||
原生任务串行排队,检查每项结束后让出机会;缓存筛选保持可用。失败项确认释放后继续独立项目;未释放会话转后台观察,只保留相关库的写入限制,独立库可继续。“停止检查”只取消检查,“取消当前任务并停止队列”取消当前批次后续动作;正在保存/关闭的调用只等待返回。普通等待 5 秒,可能正在写入时最多再等到 120 秒后交后台,这不是结束进程的期限。
|
||||
|
||||
保存已返回成功、关闭失败、资源仍占用可以同时出现。查看本轮保存/关闭标记和独立释放结果,不能因进程退出就认定工程已保存。管理更新若已经移除、尚未重新导入就取消,按“需恢复”核对,不自动补做下一次导入。重启发现未完成任务时只核对身份和资源,不自动重放。
|
||||
|
||||
权威状态桥不可用时保留未知/不可用;legacy 读取只观察已打开且库身份匹配的 Library Manager。没有匹配窗口、存在模态提示或树不可读时返回 UNKNOWN,不自动启动或应答窗口。
|
||||
原生任务串行排队,检查每项结束后让出机会;缓存筛选保持可用。失败项确认释放后继续独立项目;实际未释放时停止后续原生操作。“停止检查”只取消检查,“取消当前任务并停止队列”同时取消前台任务及后续后台检查,已进行的写入等待安全结束,不强杀代替取消。
|
||||
|
||||
新增拒绝同名冲突;更新先原生移除再导入,失败可能需要人工备份恢复;移除后重新读取目录确认。版本回退由操作员在原生界面选择,核对工程内容后单独校验。
|
||||
|
||||
新增和替换不调用 ASCII/CSV/EDIF 导出器;原生成功回执、重新读库、目标工程关联、顶层块及 Layout 确认后记录上传完成,不等同于 READY 或原理图语义等价。顶层块允许来源名或本次 CBB 注册名,保留原生命名变换记录;其他名称仍拒绝。其余文件差异单独保留清单并提示核对,不因 PRJ 规范化或历史记录差异阻止后续条目。可在批次开始前取消“上传后自动校验”。来源旧库路径可在暂存副本中改为所选目标库,来源原件不改;无效来源按行报告,已释放的失败不阻止后续条目。
|
||||
|
||||
## 历史记录、操作结果与报告
|
||||
|
||||
管理写入无法取得占用确认、或恢复安装前选择跳过时,记录 `SKIPPED`(已跳过 / 未执行);取消记录 `CANCELLED`。这两者不等于实际上传或恢复失败。文件核对失败仍记录“需要恢复”并禁止自动重放该目标;后续独立 CBB 在会话释放及自身写前检查通过后可继续。
|
||||
|
||||
校验和管理遇到历史释放记录时,先复核实际进程、地址、独占文件及导出副本。确认释放后归档记录再继续,不以历史 JSON 本身判定真实占用;同目标未完成写入仍需核对,不自动重放。释放证明在管理首次原生调用前写入检查点,并在结果中保留。
|
||||
|
||||
管理操作生成目标工程、库配置和共享依赖的写前/写后主要文件清单及新增、删除、修改差分;不增加自动全库备份,也不声称检查了其他 CBB 内容。报告不可用与原生操作失败分别记录;本任务已释放时可继续独立项。
|
||||
@@ -32,7 +24,7 @@
|
||||
2. 数据库服务器可能服务同库其他用户。本工具不允许强制结束服务器,命令行指向本库也不构成独占授权;由库管理员核对用户和服务器状态。
|
||||
3. “强制结束客户端”是另行确认的异常处理,只允许属于当前 Windows 用户和会话、已确认作用域和精确进程身份的 Expedition PCB、Library Manager、viewdraw、iCDB Project Backup 客户端。后台导入器、脚本宿主和归属未知的进程同样不在强制名单。
|
||||
4. 警告明确告知客户端中其他已打开工程可能一并退出、未保存更改会丢失、写入中的工程可能需要恢复。执行前持久保存库外 `consent.json`,包含目标库、名单、创建身份和排除项;写入失败不执行。派发处核对快照身份和原预览范围,最终句柄处核对创建时间、完整映像、用户 SID、Windows 会话和原生活动;变化时拒绝。
|
||||
5. 预览和执行前检查进度与本轮 Output。本工具登记的 Save/Close/原生调用尚未确认返回,或 Backup/Restore/Repair 进行中、状态无法确认时,不放行普通“强制结束客户端”。可查看后台窗口的标题、输出和所在桌面;仅当当前窗口唯一存在已识别的 Cancel/取消按钮时,提供单独确认的原生取消。核对身份、用户会话和按钮快照后发送请求,再重新检查实际结果;没有识别到按钮时不猜菜单参数,不抢占前台。
|
||||
5. 预览和执行前检查进度与本轮 Output。Backup/Restore/Repair 进行中或状态无法确认时,不强制结束。可查看后台窗口的标题、输出和所在桌面;仅当当前窗口唯一存在已识别的 Cancel/取消按钮时,提供单独确认的原生取消。核对身份、用户会话和按钮快照后发送请求,再重新检查实际结果;没有识别到按钮时不猜菜单参数,不抢占前台。
|
||||
6. 每项动作前后持久记录实际结果,异常保留已完成/未执行项。若最终记录保存失败但独立库释放证明已确认,界面明确提示记录失败并接受释放事实,不伪造新的占用。
|
||||
7. 客户端退出仅证明进程结束,不表示修复成功或 READY。服务器仍活跃或库状态未知时保留 PARTIAL、检查点和映射。只有完整的独立释放证明才解除匹配的历史记录;空进程列表本身不是释放证明。
|
||||
|
||||
@@ -42,12 +34,6 @@
|
||||
|
||||
程序回退须先关闭当前客户端,再运行此前候选包;它不恢复丢失更改或被中断的原生事务。工程恢复另行在隔离副本验证,保留前后证据并重新校验。Windows 10、共享库跨机器并发和现场服务器失联恢复仍待验收,fake 测试和文件头损坏试验不代替现场验收。
|
||||
|
||||
## 已知限制与证据位置
|
||||
|
||||
A/B 输入的独立 EDIF 导出曾返回 `0xC0000005`,尚未定位;普通导入已不依赖该导出,导入是否完成以本次原生操作与复读证据判定。Windows 10、跨机器共享库和现场失联故障副本仍待验收;跨机释放依赖 SMB 共享模式语义,目前没有跨机实测。自动 ICDB Repair 保持关闭,共享数据库地址残留或晚到弹窗按现场状态继续核对。
|
||||
|
||||
代码合并不表示现场验收完成。文档中的本机路径、日志、截图、测试 XML 和候选包未入库;仓库仅保留验证摘要,原始材料需在验收机器查看或另行归档。
|
||||
|
||||
## 历史上传校验检查表
|
||||
|
||||
## 1. 输入与证据
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
## 残留客户端与共享服务器
|
||||
|
||||
0.2.4b2 的默认检查、校验、取消和释放流程保留正在原生调用中的 worker 和保存/关闭助手。停止只阻止后续动作,必要时转后台观察;保存、关闭、进程退出和资源释放分别记录。独立确认的“强制结束客户端”也不放行本工具尚未返回的 Save/Close。符合其他释放条件的受支持客户端仍可另行确认结束;这会影响其其他工程,属于异常退出处理,不能替代 Repair。
|
||||
0.2.4b1 的默认检查、校验、取消和释放流程不会强杀原生会话。操作员可以在独立确认界面强制结束属于当前 Windows 用户和会话、名单中的受支持客户端;这会影响该客户端内其他已打开工程,未保存更改可能丢失,属于异常退出处理,不能替代 Repair。
|
||||
|
||||
ICDB 数据库服务器即使命令行指向当前中心库,也可能服务其他用户,**本工具不允许强制结束服务器**。归属未知的进程、后台导入器和脚本宿主同样不允许强制结束;由库管理员核对用户和服务器状态后处理。
|
||||
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
{
|
||||
"date": "2026-11-06T09:27:28.849706+00:00",
|
||||
"source_commit": "44bb734de80afbe3ff04ba72d52a465ff3b91684",
|
||||
"version": "0.2.4b2",
|
||||
"reason": "New user icon was uncommitted in original workspace and absent from isolated worktree; synchronize all three assets.",
|
||||
"assets": [
|
||||
{
|
||||
"name": "cbb_refresh_verify.ico",
|
||||
"sha256": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"bytes": 123139
|
||||
},
|
||||
{
|
||||
"name": "cbb_refresh_verify.png",
|
||||
"sha256": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"bytes": 1187049
|
||||
},
|
||||
{
|
||||
"name": "cbb_refresh_verify.svg",
|
||||
"sha256": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328",
|
||||
"bytes": 1582896
|
||||
}
|
||||
],
|
||||
"exe_icon_frames_match_current_ico": true,
|
||||
"exe_icon_frame_count": 7,
|
||||
"qt_window_icon_matches_current_ico": true,
|
||||
"frozen_product_module_bytecode_matches_source": true,
|
||||
"module_count": 62,
|
||||
"packaging_tests": {
|
||||
"passed": 13
|
||||
},
|
||||
"frozen_smoke": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2-iconfix\\smoke-334dde93\\result.json",
|
||||
"exe": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2-iconfix\\dist\\CbbRefreshVerify-Background\\CbbRefreshVerify.exe",
|
||||
"exe_sha256": "7c4a78d9d2116f637c2a236a82979db2ce49b9b5fa6493a16e66fc803b38d999",
|
||||
"zip": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2-iconfix\\CbbRefreshVerify-0.2.4b2-iconfix-44bb734.zip",
|
||||
"zip_sha256": "4a0a96321801fdebf13fed0f850a0c4b32d6928480288fd35c2d36f534e6e5b5",
|
||||
"zip_bytes": 56846008,
|
||||
"runtime_changes": false,
|
||||
"full_runtime_suite_rerun": false,
|
||||
"prior_runtime_suite": {
|
||||
"passed": 1717,
|
||||
"source_commit": "5873b7146b61d0cdd0eb22f6f2941797b02f38fc"
|
||||
},
|
||||
"pr": 13,
|
||||
"draft": true
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
# 0.2.4b2 原生操作生命周期候选
|
||||
|
||||
本候选处理 PR #12 评论 297 的三条 P1 及直接相关的停止、释放记录问题。ICDB 自动 Repair 仍关闭,现场失联恢复尚未验收。本轮不合并、不发布正式版、不关闭工单。
|
||||
|
||||
差分审查入口:[Draft PR #13](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13),依赖 #12。
|
||||
|
||||
**当前图标修正版:** `44bb734` 将原工作区的新版蓝色对勾/环形箭头 ICO、PNG、SVG 同步进候选分支。已核对 EXE 内嵌的七个尺寸图标、Qt 窗口图标及三份打包资源一致,13 项打包测试和冻结入口冒烟通过。62 个产品模块字节码保持与当前源码一致,未为资源替换重跑业务全量。当前便携包为 `CbbRefreshVerify-0.2.4b2-iconfix-44bb734.zip`(56,846,008 字节),SHA-256:`4a0a96321801fdebf13fed0f850a0c4b32d6928480288fd35c2d36f534e6e5b5`。实际程序路径及验证明细见[图标修正记录](2026-11-06-icon-candidate-validation.json)。下文首次候选包哈希保留用于历史追溯。
|
||||
|
||||
## 行为
|
||||
|
||||
- 停止、超时、失败收尾和监督器失联只请求停止后续动作,不强杀可能正在 Save/Close 的 worker 或 cscript。保存助手先持久登记精确身份,再通过启动门进入 COM。保存返回、关闭返回和独立资源释放分别记录;进程消失不能把未知保存升级为成功。
|
||||
- 普通停止等待 5 秒;可能正在写入时最多等待 120 秒后转后台观察。相关库的租约、映射和精确进程观察继续保留,不占全局队列票据;独立库可以运行。用户取消的批次不自动恢复。
|
||||
- 管理 catalog/add/remove 使用统一监督器身份、取消信号、启动门和会话记录。更新在 remove 后停止,记录需恢复,不继续 add。异步 Add 提交前必须成功保存 NATIVE_CALL;提交后记录失败仍保留监督。未知 Add 结果不触发自动 Close/Quit,明确且已应答的原生失败可正常收尾。
|
||||
- 重启在后台核对受控记录,不执行记录中的命令或重放写操作。PID 复用只观察替代进程,继续独立资源核对;证明成立才解除对应等待。报告错误、损坏 JSON 本身不生成全局占用。
|
||||
- 权威状态桥保持默认;legacy 读取只观察已打开、匹配库且可读取的 LM,不启动程序、不回答提示、不关闭用户窗口。无法观察保持 UNKNOWN。
|
||||
|
||||
界面保持三个页签。新增说明写在本文和代码中;界面仅呈现当前状态和操作结果。原工作区、用户图标改动和已运行程序未替换。
|
||||
|
||||
## 实现与审查
|
||||
|
||||
基线为 `5eb4b2d`,独立分支为 `codex/runtime-lifecycle-safety`。保存与只读接线共用 mentor_adapter,审查顺序为:事实/会话协议 → 保存与停止 → 管理监督 → 界面交接 → 独立审查修正。共享文件的 A/C 接线合并在同一提交,候选仅在三单元联通后生成。
|
||||
|
||||
独立审查发现并修正:IDENTITY_CHANGED 提前结束观察、异步 Add 阶段不准确、权限 COM 查询后未再次检查取消,以及写入阶段记录失败后仍继续提交 Add。新增回归先复现失败,再验证修正。该审查不等于真实 Mentor 数据恢复验收。
|
||||
|
||||
## 验证口径
|
||||
|
||||
可机读结果、源码身份、XML 与候选包哈希见 [验证记录](2026-11-06-runtime-lifecycle-validation.json)。Python 全量回归、实际 32 位 cscript 的 FakeDoc Save/Close、真实 Windows 测试进程的父进程退出,以及冻结入口冒烟分别记录。
|
||||
|
||||
最终源码提交 `5873b71`:**1,717 passed**,编译与 diff 检查通过。正式候选 GUI 及四类 worker 入口冒烟通过;62 个产品模块的冻结字节码与当前源码一致。独立冻结夹具的保存/管理 × 用户取消/父进程退出共四个场景通过。唯一已知测试警告为 pywinauto 的 STA 模式提示。
|
||||
|
||||
首次候选便携 ZIP 为 `CbbRefreshVerify-0.2.4b2-runtime-lifecycle-5873b71.zip`,54,227,147 字节;SHA-256:`5983a4e99884d9551d1dba3d81af88f754ce876c19a780fe82e8ea9fd58a566b`。未上传为正式 Release。构建、XML 和各专项结果文件的实际路径保存在验证 JSON。
|
||||
|
||||
冻结测试夹具是独立测试程序,使用同一批产品模块并替换外部原生边界;不随候选交付,也不是应用实际按钮操作或真实数据库修复。冻结产品的 GUI、启动前取消、拒绝错误桌面的管理入口、进程探针及仅观察的弹窗代理单独冒烟。
|
||||
|
||||
可复现脚本在 `tests/support/runtime_lifecycle_frozen_*.py`。它们是实际执行脚本的逐字节副本,最终套件完成后归档,未改变产品源码或 pytest 收集范围。先按现有 spec 构建产品,再以 `runtime_lifecycle_frozen_fixture.py` 为独立 PyInstaller onedir/console 入口、产品 `src` 为搜索路径构建夹具;`runtime_lifecycle_frozen_smoke.py <worktree> <artifact-root>` 和 `runtime_lifecycle_frozen_boundaries.py <worktree> <artifact-root>` 分别验证产品与夹具。产物目录结构见验证 JSON,不应将测试夹具放入便携包。
|
||||
|
||||
本轮没有在生产库执行原生写入、删除地址/锁文件、强杀 Mentor、选择历史版本或重放旧管理任务。下列项仍为 **未验收**:
|
||||
|
||||
- 使用本候选实际按钮完成真实 Mentor 隔离副本的 Save 中停止、延迟 Close、管理失联及独立库继续。
|
||||
- Windows 10、共享网络库和跨机器并发。
|
||||
- 现场故障一致副本上的 ICDB 失联恢复、数据版本和 READY 验收。
|
||||
|
||||
原生 COM 调用本身可能不可取消。后台观察提供状态与资源保护,不承诺把任意卡死进程自动安全结束。回退程序不撤销数据库事务;工程恢复仍依靠人工一致备份或明确选择的原生历史版本。
|
||||
@@ -1,387 +0,0 @@
|
||||
{
|
||||
"date": "2026-11-06T08:53:02.058981+00:00",
|
||||
"version": "0.2.4b2",
|
||||
"base_commit": "5eb4b2d7ed09947f19310ba80ba3b9a2a09b6f7d",
|
||||
"source_commit": "5873b7146b61d0cdd0eb22f6f2941797b02f38fc",
|
||||
"src_tree": "ef5ef877665fff179dd6d21d8d6f86e8de0a7e5b",
|
||||
"pytest_tests_tree": "35f5ad42f2c6150bf5762a46cdeb9880d1fc0d0c",
|
||||
"environment": {
|
||||
"platform": "Windows-11-10.0.26200-SP0",
|
||||
"python": "3.12.10",
|
||||
"mentor_library_manager_file_version": "2012.0.522.442",
|
||||
"mentor_library_manager_sha256": "a9c4c3d806794dbdc56d2bc4c637a1cf25e87e98644a7d5fd4eb0067ca5845e0",
|
||||
"mentor_home": "D:\\Mentor\\7.9.5EE\\SDD_HOME",
|
||||
"matches_validated_mentor_library_manager_binary": true
|
||||
},
|
||||
"tests": {
|
||||
"final_full": {
|
||||
"status": "passed",
|
||||
"tests": 1717,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-final-1717.xml",
|
||||
"xml_sha256": "1d427f97dd04afbf8912bbdf787b0b9dfd1ed383d32bfe07f7a94cc24f9c5292"
|
||||
},
|
||||
"known_warning": "pywinauto: Revert to STA COM threading mode",
|
||||
"compileall": "passed",
|
||||
"git_diff_check": "passed",
|
||||
"independent_review": "important findings resolved through 051498b"
|
||||
},
|
||||
"frozen_product": {
|
||||
"build": "passed",
|
||||
"smoke": {
|
||||
"gui": {
|
||||
"status": "passed",
|
||||
"exit_code": 0
|
||||
},
|
||||
"verify-worker": {
|
||||
"exit_code": 1,
|
||||
"status": "passed",
|
||||
"evidence": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\smoke-74da6fd5\\verify-worker"
|
||||
},
|
||||
"management-worker": {
|
||||
"exit_code": 2,
|
||||
"status": "passed",
|
||||
"evidence": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\smoke-74da6fd5\\management-worker"
|
||||
},
|
||||
"owner-probe": {
|
||||
"exit_code": 0,
|
||||
"status": "passed",
|
||||
"evidence": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\smoke-74da6fd5\\owner-probe"
|
||||
},
|
||||
"dialog-agent": {
|
||||
"status": "passed",
|
||||
"exit_code": 0,
|
||||
"scope": "empty PID set, observe only"
|
||||
},
|
||||
"module_origins": {
|
||||
"status": "passed",
|
||||
"module_count": 62,
|
||||
"source_root": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795-review-stack\\src"
|
||||
},
|
||||
"version": "0.2.4b2"
|
||||
},
|
||||
"evidence": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\smoke-74da6fd5\\result.json",
|
||||
"evidence_sha256": "4f354f3700d09e299e6437d36492fd8b380440eae7e5ec859c90645f16004ac2",
|
||||
"module_bytecode_matches_source": true,
|
||||
"module_count": 62,
|
||||
"modules": [
|
||||
{
|
||||
"module": "cbb_refresh_verify",
|
||||
"source_sha256": "dd960394d88657820dba858792abf0de258e05efceb08ae2f0b39c6ad78bc469"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.application",
|
||||
"source_sha256": "433c22b01df8376651c43cc9fe7f9551b531dcd3b3e590b77cb3ec1bfbfd2de6"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.backup_recovery",
|
||||
"source_sha256": "ea7bb90151e825efb6163e43ed344b62407565005f0a0459c423ba2205539373"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.batch_status",
|
||||
"source_sha256": "918c80dd4f75146baa6b7616ce415ac89ee28f6c1f46b2bfda77bacc998b5b62"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.com_runtime",
|
||||
"source_sha256": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.content_check",
|
||||
"source_sha256": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.defaults",
|
||||
"source_sha256": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.desktop_worker",
|
||||
"source_sha256": "1dd449e9885b32cb479970ddb9d1e3b580bc6339f9b491be0a414a1de8054efa"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.diagnostic_open",
|
||||
"source_sha256": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.dialog_agent",
|
||||
"source_sha256": "6a9b9802912afc4dd670ee9b28845d97bd64fe55fd577815ef729850fcff78db"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.dialog_models",
|
||||
"source_sha256": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.dialog_probe",
|
||||
"source_sha256": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.dialog_rules",
|
||||
"source_sha256": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.dialog_supervisor",
|
||||
"source_sha256": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.failed_session",
|
||||
"source_sha256": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.icdb_maintenance",
|
||||
"source_sha256": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.icdb_ownership",
|
||||
"source_sha256": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.icdb_recovery",
|
||||
"source_sha256": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.integration",
|
||||
"source_sha256": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.library_lock",
|
||||
"source_sha256": "eea9021300410cc810eaa0e18aac546c94139f89528f5d68784ef3f943b65ce4"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.library_manager_verify",
|
||||
"source_sha256": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.library_reader",
|
||||
"source_sha256": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.maintenance_entry",
|
||||
"source_sha256": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.management",
|
||||
"source_sha256": "3d6e2505ce6e21acdea88d59b920229ba1ce2cee6c914ac1b0b8267cf0d34ffc"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.management_transaction",
|
||||
"source_sha256": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.mentor_adapter",
|
||||
"source_sha256": "15bde6706c6533d839646b894896237921b89a8a3ce3016aa8161c591dab314f"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.mentor_paths",
|
||||
"source_sha256": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.models",
|
||||
"source_sha256": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_add_failures",
|
||||
"source_sha256": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_backup",
|
||||
"source_sha256": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_engineering_identity",
|
||||
"source_sha256": "a241bc3be7dc5a922ce728f1febd3684e79e6e45935589c80a4b1a5933e05df5"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_export_guard",
|
||||
"source_sha256": "5120c13e4ef1255d4c61316eb40005c4039c23e41edca4437bd0ef28b543a959"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_management",
|
||||
"source_sha256": "27a835bc31cfe0e1a09d767977e5c348d40e246c58d58ce1ef085411afe6d56e"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_occupancy",
|
||||
"source_sha256": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_repair",
|
||||
"source_sha256": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.native_repair_ui",
|
||||
"source_sha256": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.network_path",
|
||||
"source_sha256": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.operation_lifecycle",
|
||||
"source_sha256": "28b6cdebd22caaf369eeb8b7236e258b8160a8fa7c7d8bfbf0980979e9eba3ae"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.operation_queue",
|
||||
"source_sha256": "57ad9da8aeedd9cd75a8c5b5fda44044bcb457670a4a323e9e8bb247198074ab"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.owner_probe",
|
||||
"source_sha256": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.pcb_bridge",
|
||||
"source_sha256": "745ef117e984021e8a3d9087a2783c1efe19bed97edcfbcfae7703a291cc6eaa"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.pcb_restore_prompt",
|
||||
"source_sha256": "5342612ad666e3faf5a9a4ce4710e9af458d357c44037135f2837dad436d5cf7"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.post_repair_consent",
|
||||
"source_sha256": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.post_verify_diagnostics",
|
||||
"source_sha256": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.reimport_recovery",
|
||||
"source_sha256": "66b2ba8f8c2ec9ae8c386d6b1aa74a1fbb6bfb509c4df0a262f8d7a0ca48469e"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.residual_sessions",
|
||||
"source_sha256": "69d39648a2f3c98a297847baf51373632acd881f034a2a011d0c3d27dbec3dfc"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.runtime_logging",
|
||||
"source_sha256": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.runtime_timing",
|
||||
"source_sha256": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.scoped_manifest",
|
||||
"source_sha256": "54cf4288e7850e220b394ae971ea98785eba631f80784a3f9354209e649f6498"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.session_record",
|
||||
"source_sha256": "394719d125b91ff124d707229f4599dcca9229d2c6e653840ef7e02f48c642b6"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.status_bridge",
|
||||
"source_sha256": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui",
|
||||
"source_sha256": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.backup_notice",
|
||||
"source_sha256": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.backup_recovery_dialog",
|
||||
"source_sha256": "621ea2efea85367b0c9bb9790040860a1ac001f40f8834289cb67c96ea0648d1"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.icdb_check_task",
|
||||
"source_sha256": "01985644641ec623ed440433248d9445ab5b9f37d27a843ec7f26267895de397"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.main_window",
|
||||
"source_sha256": "a625b2934a34c86ff30eaf115e50b0560cbb24f3dccf15bbb51574a9808c660d"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.management_dialog",
|
||||
"source_sha256": "93b7a7464161e7448aa78c42ca8742c970e80387f9c6c1b9b4b6a07532da3ebf"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.pcb_restore_dialog",
|
||||
"source_sha256": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.residual_release_dialog",
|
||||
"source_sha256": "ca0e18886457800cae7b543286395f05db1a74eb41e53fc54cfee57f93294368"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.ui.workers",
|
||||
"source_sha256": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.verify_diagnostics",
|
||||
"source_sha256": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8"
|
||||
},
|
||||
{
|
||||
"module": "cbb_refresh_verify.verify_runner",
|
||||
"source_sha256": "2c7c37d2b510ab5735cd4a71cb834768c711e31b0ce5dd28b23acb8dcfe22ffb"
|
||||
}
|
||||
],
|
||||
"exe": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\dist\\CbbRefreshVerify-Background\\CbbRefreshVerify.exe",
|
||||
"exe_sha256": "9051ab52acb67d0d291ae230e7d55d1ce6f580f653d58a82d463b7c42cebb90f",
|
||||
"zip": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\CbbRefreshVerify-0.2.4b2-runtime-lifecycle-5873b71.zip",
|
||||
"zip_sha256": "5983a4e99884d9551d1dba3d81af88f754ce876c19a780fe82e8ea9fd58a566b",
|
||||
"zip_bytes": 54227147
|
||||
},
|
||||
"frozen_native_boundaries": {
|
||||
"scope": "separate frozen fixture; fake native COM/management boundary",
|
||||
"product_native_database_recovery_validated": false,
|
||||
"results": [
|
||||
{
|
||||
"mode": "save",
|
||||
"stop_kind": "cancel",
|
||||
"status": "passed"
|
||||
},
|
||||
{
|
||||
"mode": "save",
|
||||
"stop_kind": "supervisor-loss",
|
||||
"status": "passed"
|
||||
},
|
||||
{
|
||||
"mode": "management",
|
||||
"stop_kind": "cancel",
|
||||
"status": "passed"
|
||||
},
|
||||
{
|
||||
"mode": "management",
|
||||
"stop_kind": "supervisor-loss",
|
||||
"status": "passed"
|
||||
}
|
||||
],
|
||||
"evidence": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\runtime-lifecycle-b2\\frozen-boundaries-cdb9d884\\result.json",
|
||||
"evidence_sha256": "9cdc149a6fa545206c361aaba278ef54c9ee2529e9a09b440c5fcf9378fc8529",
|
||||
"module_bytecode_matches_source": true,
|
||||
"module_count": 47,
|
||||
"validation_helpers": [
|
||||
{
|
||||
"file": "tests\\support\\runtime_lifecycle_frozen_fixture.py",
|
||||
"sha256": "b87761c06a300f0d93bce864d3d31e045f2135324b2a9a42f8682ccbff09ad22"
|
||||
},
|
||||
{
|
||||
"file": "tests\\support\\runtime_lifecycle_frozen_boundaries.py",
|
||||
"sha256": "bf98533a1c06ccf4453d20b3804323779719e697141b8dc64fa679960a979cfd"
|
||||
},
|
||||
{
|
||||
"file": "tests\\support\\runtime_lifecycle_frozen_smoke.py",
|
||||
"sha256": "b11e0aac71c1079625ac9832dc5c38197bc80110478c4d9e02c2a3bc58a2a2d0"
|
||||
}
|
||||
],
|
||||
"helpers_copied_after_full_suite": true,
|
||||
"note": "Tracked helper files are byte-identical copies of the scripts executed from diagnostics. Not shipped; do not replace real application-button acceptance."
|
||||
},
|
||||
"not_run": [
|
||||
"Real Mentor isolated-copy application-button Save/Close and management-loss scenarios",
|
||||
"Windows 10 and cross-machine shared-library concurrency",
|
||||
"Field ICDB disconnected-session recovery and data-version/READY acceptance"
|
||||
],
|
||||
"auto_repair_enabled": false,
|
||||
"production_native_writes_performed": false,
|
||||
"merged_or_published": false,
|
||||
"issues_closed": false,
|
||||
"pull_request": {
|
||||
"number": 13,
|
||||
"url": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13",
|
||||
"draft": true,
|
||||
"base": "codex/review-residual-release",
|
||||
"creation_head": "8e946c6e7a115a1ac22101b97df9b3fc6e2862f0"
|
||||
}
|
||||
}
|
||||
@@ -1,109 +0,0 @@
|
||||
{
|
||||
"date": "2026-11-09",
|
||||
"scope": "New full reviews #344/#345/#348 and runtime re-review #326",
|
||||
"branch_heads_before_validation_commit": {
|
||||
"codex/review-native-backend": "e8a1714d956e733648dacda1bfdce387e07e4cba",
|
||||
"codex/review-ui-integration": "0fca6abb4e1b54bd06e6986782ccf45383306e43",
|
||||
"codex/review-residual-release": "a7df105616a8f5cfab61b85e0c5d93aa74ded415",
|
||||
"codex/runtime-lifecycle-safety": "a045683c8a6d6918ec701e2944d0e20c25296b65"
|
||||
},
|
||||
"environment": {
|
||||
"python": "3.12.10",
|
||||
"windows": "10.0.26200"
|
||||
},
|
||||
"full_suite": {
|
||||
"tests": 1775,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"duration_seconds": 273.089,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\2026-11-09-full-review-final-1775.xml",
|
||||
"xml_sha256": "a993473b7784748f671a3d38a0e80f1aa7dfaf714b23d6378ed26d0481c1b904",
|
||||
"warnings": [
|
||||
"Existing pywinauto STA COM threading warning"
|
||||
]
|
||||
},
|
||||
"focused_runs": [
|
||||
{
|
||||
"scope": "Backend",
|
||||
"passed": 287
|
||||
},
|
||||
{
|
||||
"scope": "UI standalone",
|
||||
"passed": 65
|
||||
},
|
||||
{
|
||||
"scope": "Residual standalone forward integration",
|
||||
"passed": 41
|
||||
},
|
||||
{
|
||||
"scope": "Final runtime/UI integration before last merge",
|
||||
"passed": 211
|
||||
},
|
||||
{
|
||||
"scope": "Terminal-publication fix lifecycle/management group",
|
||||
"passed": 159
|
||||
}
|
||||
],
|
||||
"compileall": "passed",
|
||||
"diff_check": "passed",
|
||||
"independent_review": "No remaining important introduced findings after fixing two queue timing findings",
|
||||
"tested_files_sha256": {
|
||||
"src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057",
|
||||
"src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a",
|
||||
"src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92",
|
||||
"src/cbb_refresh_verify/library_lock.py": "636e0b1c84061796424da6289361c059fecacad31802df2edc3f3455ec8c40d8",
|
||||
"src/cbb_refresh_verify/management.py": "29ecb101dacf2bb23b8b8931c01078956dd6c641444e82a69a62e811c7261fc5",
|
||||
"src/cbb_refresh_verify/native_management.py": "7598a18da12dd527e9403a956b1ade76b253f89a9ee4790f0802244b54616844",
|
||||
"src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f",
|
||||
"src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5",
|
||||
"src/cbb_refresh_verify/scoped_manifest.py": "26ba8303e2de294374443513d667570abed2f0f2563a2e969a9cb35e74d65c00",
|
||||
"src/cbb_refresh_verify/session_record.py": "fbf31fb38894f75d725b269229c7d928be54136b491cc5339f7a4b018d7b7f5e",
|
||||
"src/cbb_refresh_verify/ui/icdb_check_task.py": "cc108974e843f31e59e90acd18ad2d810e6bcd67d7cf303b2b772501d95b6d8e",
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "a05d9d838be4b9e9f6e2b612c25186e77f23899bffc59b67f50fea597eab47c9",
|
||||
"src/cbb_refresh_verify/ui/management_dialog.py": "f3fc740197fc109ae3ddd8ead556a8847d5e00ec9a97d5cc2e166d656fb861ef",
|
||||
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "82382af142379c540721dbfa7ba5a5d766130d89807e1f34ad032a0ad1411f5c",
|
||||
"tests/test_batch_status.py": "c1f9af0c7c6f3171b3726fb53346f480b13b8d9cd88111a9c12e2fae2392bbff",
|
||||
"tests/test_batch_status_faults.py": "314e890c9aee439c8a75b4dfd605685240c74f6212da975fd50526bd70b4a0ff",
|
||||
"tests/test_management_retry_blockers.py": "124dbef291dbe331ba0c3e7de1665c910ea43e37b1563429b387f0f2233953ee",
|
||||
"tests/test_management_supervision.py": "2dcadd6551a94c52e5d4e74285959f10144a89c48af87e508abaea945652d1f6",
|
||||
"tests/test_pcb_bridge.py": "527fb63147a203a2e9419da989aff600d3e461580989e39e8ede3a8cc57b901a",
|
||||
"tests/test_residual_release_dialog.py": "10b23d009703d542e5ce8ecb35a4833e0135bb8852b4116e49eedc7010397a1e",
|
||||
"tests/test_review326_dispatch_and_receipts.py": "ce4d529246da1c4d53c3dec70ef49542165064404301dec3e32851df62492ecf",
|
||||
"tests/test_review326_queue_guidance.py": "c2c97aceddd9713618afdd5f2a7be4764b56a1b62fc672282fb8c218b4969c74",
|
||||
"tests/test_review345_ui_cli.py": "795e7e4f9bda8874c6a65a08863cab19f4adb3412287276ee2960588f0fd2fa8",
|
||||
"tests/test_review348_release_comparison.py": "ceccdb3d6f7bc6cb65562c059f13aa2bc5d89d98c6f64b0f11d9b943ebbde165",
|
||||
"tests/test_review_backend_followup.py": "c10704fae250c9e204c995843a2baab0a2562e51984ae4d429aa438ba1c88113",
|
||||
"tests/test_review_management_ui_followup.py": "746602a84c3ba9cb041c5dd354b39d344355b71a3666b27a47eb9aee231e171c",
|
||||
"tests/test_scoped_manifest.py": "d22749cd240ab365f91ebb9d0469dc3336150338a84a77c1aeb6fbc20ccd439f"
|
||||
},
|
||||
"icon_sha256": {
|
||||
"ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328"
|
||||
},
|
||||
"design_choices": [
|
||||
"Production status always fresh; low-level checkpoint reuse explicit",
|
||||
"Final source and target hashes retained; copy hashed in stream",
|
||||
"Optional CLI limit; default all requested targets",
|
||||
"Release mapping cleanup serialized before waiting task admission",
|
||||
"New native calls vetoed on supervisor loss; accepted pending calls may record continuation identity"
|
||||
],
|
||||
"candidate_rebuilt": false,
|
||||
"automatic_icdb_repair": false,
|
||||
"merged": false,
|
||||
"issue_closed": false,
|
||||
"not_verified": [
|
||||
"Real Mentor/native database writes during loss/cancel",
|
||||
"Frozen execution of this revision",
|
||||
"Windows 10",
|
||||
"Shared network/cross-machine release"
|
||||
],
|
||||
"first_full_run": {
|
||||
"tests": 1774,
|
||||
"failures": 1,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\2026-11-09-full-review-first-failure-1774.xml",
|
||||
"xml_sha256": "9d7275b0a4122db12b8367e4367759f3051ce29a56645da5098776d8b9ca2bc8",
|
||||
"reason": "FINISHED permitted watchdog orphan exit before result publication; receipt now precedes terminal phase"
|
||||
}
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
# Full-review follow-up: comments 344 / 345 / 348 / 326
|
||||
|
||||
This revision follows the new November 9 full reviews. The old November 6 deep-review backlog remains outside the user's previously selected scope.
|
||||
|
||||
## Backend: #10 / 344
|
||||
|
||||
- Status scans default to fresh queries. The low-level explicit checkpoint reuse API remains for compatibility with controlled read-only scans; production status queries continue to use `resume=False`. Its lightweight fingerprint is not described as proof that payload databases are unchanged.
|
||||
- Change reports include rule version, compared scope, excluded directory categories/suffixes and positional runtime rules from the classifier constants. Unrelated CBB content is still explicitly outside comparison. Counts in the management result refer to compared engineering files.
|
||||
- Removed the tests-only `pcb_bridge.execution_outcome` helper with optimistic release defaults; active production release checks remain authoritative.
|
||||
- SHA-256 is computed during streaming of unlocked primary files instead of a separate preliminary source pass. The final source SHA-256 and target SHA-256 remain. This reduces three source reads to two without dropping same-size/same-mtime mutation detection. The review's suggested removal of final source hashing was not adopted because it would weaken the requested source-change check.
|
||||
|
||||
Backend commit `e8a1714`; 287 focused regressions passed. Details and exact command are in `docs/reviews/2026-11-05-native-backend.md`.
|
||||
|
||||
## UI/CLI: #11 / 345
|
||||
|
||||
- Replaced repeated same-purpose result windows with lifecycle-managed dialogs. Task recovery associations survive independent result windows; deleted dialogs/actions are forgotten. Forward integration keeps #12's enabled release/resume paths and recreates a resume action if its old summary was closed.
|
||||
- Closing waits visibly, including a persistent still-waiting notice after 120 seconds. It does not promise a kill deadline or interrupt a write. The final idle check includes the independent lifecycle pool.
|
||||
- Optional positive CLI `--limit` bounds requested names in order. Omission retains the existing all-target behavior rather than silently dropping work. Logs distinguish selected/total/remaining and explain retained mappings after exceptions or unsafe results, pointing to confirmed release instead of an unconditional network-drive deletion.
|
||||
- Removed `if False` branches/dead reload field in the standalone UI PR; forward integration retains the later enabled release behavior. File line-ending rules from the prior tip remain.
|
||||
|
||||
UI commit `342a726`; 65 targeted UI/CLI tests passed on its branch. Integration keeps PR13 stop propagation; CLI test doubles were updated to accept and assert that stop input.
|
||||
|
||||
## Residual release: #12 / 348
|
||||
|
||||
The unreadable-window poisoning and oversized repeated-output findings target the old `5eb4b2d` tree and are already fixed in `651b539`. This revision additionally displays confirmation scope and actual execution result as separate columns, and counts allowed-but-unreleased rows with their reasons. Preview consent never overrides a fresh activity/identity refusal. Residual commit `14c9a74`; 35 targeted tests passed.
|
||||
|
||||
## Runtime and queue: #13 / 326
|
||||
|
||||
- Native management launch/open/create/close/quit/Add submission/Remove launch and editor entry use `dispatch_native`. It records the pending phase before callback entry, synchronous return records POSTCALL, callback failure records UNCONFIRMED, and asynchronous submission requires its existing explicit result acknowledgment. Save/failure-close helpers retain their atomic registration/start gate.
|
||||
- Identity recording for an already-started Remove uses explicit continuation semantics: it must match the operation's current pending phase, cannot authorize a new call, and may continue tracking/waiting after supervisor loss. A real boundary regression demonstrates that loss immediately after Popen cannot abandon its wait. `required=False` controls journal errors, not permission to dispatch after supervisor loss.
|
||||
- Pre-proof snapshots freeze alias generation, block and operation ID. Full-library proofs and operation receipts list `reconciled_blocks` and exact retained sessions; a replaced operation is not acknowledged.
|
||||
- Cached queue reasons name the retained CBB and expose a release entry in verification, ICDB and management waiting states. NativeQueue emits an updated notice only when the cached wait reason changes, so a task transitioning from running to retained cannot leave a hidden dead-end action. Queue predicates do no filesystem/native I/O.
|
||||
- The queued release's mapping finalizer runs inside the serialized release action before it admits the waiting native ticket. The completion signal skips later destructive mapping cleanup. This prevents an old proof from clearing a new task's mapping retention. Both normal confirmation and native Cancel use this finalizer. Closing the residual panel does not mark the still-queued parent action finished.
|
||||
|
||||
## Validation and limits
|
||||
|
||||
The final focused integration run passed 211 tests. New tests were first observed failing for missing dispatch/receipt facts, dispatch veto after accepted Remove, missing queue explanations, changed wait reasons, stale mapping cleanup and dialog lifecycle boundaries. Independent review's two queue timing findings were corrected and re-reviewed with no remaining important introduced finding.
|
||||
|
||||
The first full run exposed one terminal-publication race (1,773 passed, one failed): management wrote FINISHED before its result receipt, allowing the orphan watchdog to exit between them. The result is now flushed before FINISHED. The regression accepts either the normal failure exit or orphan exit only after checking the saved result and the absence of a subsequent native action. A new test first reproduced the missing receipt at the FINISHED transition; 159 focused lifecycle/management tests then passed. The failed full XML is preserved separately, and the full suite is rerun on the corrected tree.
|
||||
|
||||
This does not require a final result before every orphan exit: PRECALL/POSTCALL may deliberately exit during an idle non-COM wait after supervisor loss, as requested by review 319. Such an exit is neither operation success nor resource-release proof. A missing final result is returned as `success=False, safe_to_continue=False` by the launcher, with the last call facts retained in the session journal for explicit reconciliation. FINISHED specifically is now published only after its final receipt; requiring a final receipt before all POSTCALL orphan exits would leave the original idle-orphan problem unresolved.
|
||||
|
||||
Full-suite counts, source hashes and immutable XML copies are in the accompanying validation JSON. Compilation/diff checks and icon equality are checked on the integrated tree. No frozen package was rebuilt; the old iconfix package does not contain this revision. No real Mentor Save/Close/Add/Remove or shared/network/cross-machine acceptance was performed. ICDB automatic Repair remains off. No merge to main, formal release, issue closure, native address/lock deletion, foreground mouse control, or native process termination is authorized by this validation.
|
||||
@@ -1,85 +0,0 @@
|
||||
{
|
||||
"date": "2026-11-09",
|
||||
"scope": "Latest comments #309/#310/#313 only; older deep-review backlog excluded by user",
|
||||
"integration_head_before_validation_commit": "b1c36e3ca6d6680d0b656a725a1db871d5ffabbd",
|
||||
"branch_heads": {
|
||||
"codex/review-native-backend": "b7baa24b5ed87256fb846236b08c75ff02887e9c",
|
||||
"codex/review-ui-integration": "e73f9c6edcb36a18fdd8a17b565cc1fb7c97f26b",
|
||||
"codex/review-residual-release": "651b539d0ef491b3fd410031b9f981d71272aac9",
|
||||
"codex/runtime-lifecycle-safety": "b1c36e3ca6d6680d0b656a725a1db871d5ffabbd"
|
||||
},
|
||||
"environment": {
|
||||
"python": "3.12.10",
|
||||
"windows": "10.0.26200"
|
||||
},
|
||||
"full_suite": {
|
||||
"tests": 1742,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"duration_seconds": 293.056,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\2026-11-09-latest-stack-full-1742.xml",
|
||||
"source_xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\cbb-refresh-verify-795-review-stack-fixes-full.xml",
|
||||
"xml_sha256": "e00376d01fa26dd8e62d065d700f8cc200000665a6958536d109336119f8a0c0"
|
||||
},
|
||||
"focused_suites": {
|
||||
"cbb-refresh-verify-795-backend-fixes": {
|
||||
"tests": 94,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"duration_seconds": 41.802,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\2026-11-09-cbb-refresh-verify-795-backend-fixes-latest-focused-94.xml",
|
||||
"source_xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\cbb-refresh-verify-795-backend-fixes-fixes-focused.xml",
|
||||
"xml_sha256": "d8580bcc766c7ad6d3ce1d9de7d44b496afaaa8c3489cf01245f1d8a7d15500c"
|
||||
},
|
||||
"cbb-refresh-verify-795-ui-fixes": {
|
||||
"tests": 43,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"duration_seconds": 5.554,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\2026-11-09-cbb-refresh-verify-795-ui-fixes-latest-focused-43.xml",
|
||||
"source_xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\cbb-refresh-verify-795-ui-fixes-fixes-focused.xml",
|
||||
"xml_sha256": "0ed470d756f0b387ca9fbf4f4891bd60abfc3faf535e67c06d6640557d627753"
|
||||
},
|
||||
"cbb-refresh-verify-795-review-stack": {
|
||||
"tests": 136,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"duration_seconds": 16.117,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\2026-11-09-cbb-refresh-verify-795-review-stack-latest-focused-136.xml",
|
||||
"source_xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\cbb-refresh-verify-795-review-stack-fixes-focused.xml",
|
||||
"xml_sha256": "2087bfa02a0251deee535acda7454c0967b1f11aa5c7125296efc78c141fec59"
|
||||
}
|
||||
},
|
||||
"compileall": "passed",
|
||||
"diff_check": "passed",
|
||||
"independent_review": "No important introduced findings before or after integration",
|
||||
"controlled_private_desktop_fixture": "passed",
|
||||
"tested_files_sha256": {
|
||||
".gitattributes": "a68c9f317ed6e4131c72269b98403c7a3f9c08d5d03e710425301bd50273e791",
|
||||
"src/cbb_refresh_verify/application.py": "b76ff891d77f0a7dba8feeb1f5ae5745ee83dee2fa46c585c187dbf9bb1c39d2",
|
||||
"src/cbb_refresh_verify/library_lock.py": "8b3286d36ad686f65ec7e30eded9c4d0f8a629ca214b39812dfba496292da976",
|
||||
"src/cbb_refresh_verify/residual_sessions.py": "b5d38a06cb2902c3612edb75b1ef83596524f02b6cf7890f6541f210d3e380ce",
|
||||
"tests/test_residual_sessions.py": "f34c77a11d2a2b08c5670a9809474afd84b212016a27b104249e5fddb4675f1f",
|
||||
"tests/test_review313_residual_isolation.py": "4052ca51c35787a8df9b63e79febd38b666da98c09976fffb34f4361381d8b4d",
|
||||
"tests/test_review_foreign_release_evidence.py": "cbf2af02418f6bd3ec720a7a7658cf97f06d1a6e12009fdff2a99f465711591e"
|
||||
},
|
||||
"icon_sha256": {
|
||||
"ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328"
|
||||
},
|
||||
"automatic_icdb_repair": false,
|
||||
"candidate_rebuilt": false,
|
||||
"not_verified": [
|
||||
"Real Mentor operations",
|
||||
"Frozen execution of this revision",
|
||||
"Windows 10",
|
||||
"Shared/network/cross-machine release"
|
||||
],
|
||||
"merged": false,
|
||||
"issue_closed": false
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
# Latest PR review follow-up: 2026-11-09
|
||||
|
||||
The user selected the November 9 latest re-review comments, excluding the older November 6 deep-review backlog.
|
||||
|
||||
| PR/comment | Result | Source/validation |
|
||||
| --- | --- | --- |
|
||||
| #10 / #309 | Proof names foreign CBB checkpoints and distinguishes requested block from effective BLOCK/LIBRARY scope. | `b7baa24`; 94 backend/lease regressions passed. See `2026-11-09-pr10-review309.md`. |
|
||||
| #11 / #310 | No new blocking finding; backend synchronized in `e73f9c6`. Existing pause semantics retained. | 43 UI/background/queue regressions passed on the UI branch. |
|
||||
| #12 / #313 | Incomplete window reads isolated by PID; bounded repeated evidence; native Cancel retains preview scope. | `651b539`; 116 relevant regressions passed, including a real controlled private desktop/window. See `2026-11-09-pr12-review313.md`. |
|
||||
| #13 integration | Both sides of the residual preview conflict retained: runtime write protection and per-PID read/scope metadata. | Integration merge `b1c36e3`; 136 focused integrated regressions passed. Full result and file hashes in the accompanying JSON. |
|
||||
|
||||
## Line endings
|
||||
|
||||
At the chain tip only, `application.py` is normalized from CRLF to LF. Replacing its LF bytes with CRLF reproduces its prior bytes exactly, and `git diff --ignore-space-at-eol` is empty for this file. `main_window.py` already uses LF. Two specific `.gitattributes` rules pin these files to LF; the global `* -text` rule and every other source file's line-ending policy remain unchanged. No repository-wide normalization or EditorConfig layer is added.
|
||||
|
||||
## Independent review
|
||||
|
||||
The reviewer found no important introduced P1/P2 in the backend/residual changes. Its focused check passed 45 tests with the private-desktop fixture excluded; the coordinator separately ran that actual fixture successfully. A second inspection of the integration confirmed that PR13's active-write, retained-session acknowledgment and durable release records coexist with the new evidence and window-read boundaries. No tests or native operations ran during that integration inspection.
|
||||
|
||||
## Reproduction
|
||||
|
||||
Use the existing `diagnostics/run_review_fixes.py` wrapper from the original workspace against each linked worktree; it isolates the test mutex and sets the intended source path/Qt offscreen. The final full run, compileall and git diff --check results are in `2026-11-09-latest-pr-stack-validation.json`, including evidence hashes and source/test file hashes.
|
||||
|
||||
Current ICO/PNG/SVG hashes match the previously corrected blue check/circular-arrow assets. No candidate executable or ZIP was rebuilt: the previous iconfix package does not contain these fixes. These are source/PR validations, not real Mentor/Windows 10/shared-network/cross-machine acceptance. ICDB automatic Repair remains OFF. PR #3 remains a historical umbrella already covered by #10–#13. The PRs stay Draft; no merge to main, formal release or issue closure is performed.
|
||||
@@ -1,7 +0,0 @@
|
||||
# PR #10 comment 309
|
||||
|
||||
Release proof now records the requested CBB, effective BLOCK/LIBRARY proof scope, identities/statuses of archived checkpoints and retained owners, and `reconciled_foreign_blockers`. For example, a BlockA operation which safely reconciles BlockB's historical checkpoint explicitly lists BlockB and the full-library proof. `data_recovery_confirmed` remains false. No extra gate, automatic backup or native action was added.
|
||||
|
||||
Three regressions first failed on missing evidence fields. After the fix, 94 backend/lease/release regressions passed; compileall and git diff --check passed. The tests use real temporary file/lease handles with the process-query boundary replaced; no production library was opened. Full regression is run again at the integrated chain tip. Real Mentor/shared-network acceptance and a rebuilt package remain outstanding.
|
||||
|
||||
Review: https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/10#issuecomment-309
|
||||
@@ -1,38 +0,0 @@
|
||||
# PR11 review 345 follow-up
|
||||
|
||||
Repeated CBB verification and ICDB check runs replace the previous result dialog
|
||||
for the same operation. Closing a result retires its Qt widgets and action
|
||||
references, while the check task keeps its requests, results, invalidated targets,
|
||||
and recovery context. A result for the other operation stays available.
|
||||
|
||||
During application shutdown, the title and status show that background work and
|
||||
path release are pending. After approximately 120 seconds a second notice says
|
||||
the application is still waiting. This is a notice interval, not a deadline;
|
||||
shutdown still waits for existing workers and never forces native tools to stop.
|
||||
|
||||
The batch CLI accepts an optional positive `--limit`:
|
||||
|
||||
```powershell
|
||||
python -m cbb_refresh_verify --batch-lmc 'Z:\library\library.lmc' --limit 2
|
||||
```
|
||||
|
||||
The limit selects the first requested names in their existing order. With no
|
||||
`--block`, the existing non-READY selection supplies those names; repeated
|
||||
`--block` options retain their explicit order. Omitting `--limit` retains the
|
||||
existing all-requested behavior. `batch_selection` logs selected, total, and
|
||||
remaining counts. On batch exceptions or unconfirmed native release,
|
||||
`batch_drive_retained` identifies the drive, remote share, display library and
|
||||
Mentor path, and directs the operator to the confirmed-release entry. It never
|
||||
disconnects a mapping while a native writer may still be active.
|
||||
|
||||
Management change counts explicitly cover the compared engineering files only.
|
||||
|
||||
Removed from the standalone PR11 head: all five `if False` blocks for the later
|
||||
release flow, and `_reload_after_maintenance` assignments and its unused reload
|
||||
branch. The hidden release control and existing method signatures remain for
|
||||
the later PR12 implementation. When integrating forward, preserve PR12's live
|
||||
release/resume behavior and retire its dialog-owned action references as well.
|
||||
Preserve PR13's asynchronous close and lease guards when adding the wait notice.
|
||||
|
||||
Validation uses the isolated offscreen review wrapper with fake native boundaries;
|
||||
it does not open Mentor, kill native processes, invoke Repair, or back up a library.
|
||||
@@ -1,21 +0,0 @@
|
||||
# PR #12 comment 313
|
||||
|
||||
## Behavior
|
||||
|
||||
Window inspection takes a Windows thread snapshot for the requested processes, finds the desktops assigned to those threads, and opens only those desktops. Failures are recorded per affected PID outside the real window list. Unrelated inaccessible desktops no longer disable healthy rows. Preview, cooperative close, forced close, native Cancel and save-prompt responses all use the same per-PID incomplete-read fact during their fresh action-time observation.
|
||||
|
||||
Unknown or active native writes still prohibit forced termination. The review's suggested blanket force override for unreadable windows is not implemented: exact identity and private-desktop ownership do not establish that Save/Repair has returned. A failed read names that session and can be retried, while other sessions remain actionable.
|
||||
|
||||
Disk evidence retains window identity and a UTF-8 output excerpt of at most 4,096 bytes, original output length and SHA-256. It omits child-control trees and duplicated native-activity output. The complete preview remains in memory for the existing details action.
|
||||
|
||||
Native Cancel carries the preview's `block_names` and checks the same Work + SymbolLibs scope before the exact-process/control checks. It no longer silently widens a scoped preview to the full library.
|
||||
|
||||
## Verification
|
||||
|
||||
The initial five regressions failed against the old implementation. After the fix, 116 residual/backend/UI/background-queue regressions passed; compileall and git diff --check passed. This includes a real controlled Windows window on a private CbbManagement desktop, read from another process, with clean fixture exit and no Mentor/native database actions.
|
||||
|
||||
The real fixture caught a platform limitation missed by API doubles: EnumThreadWindows silently omits windows on another desktop. The final implementation maps threads to desktop names and uses OpenDesktop/EnumDesktopWindows for only those mapped desktops. GetThreadDesktop's borrowed handle is never closed; owned OpenDesktop handles and the thread snapshot are closed.
|
||||
|
||||
Independent review and the full integrated-chain run are recorded at the final PR #13 tip. Older deep-review comments #297-#300 remain outside this explicitly selected scope. No candidate was rebuilt; real Mentor, Windows 10 and shared/network release scenarios remain unverified.
|
||||
|
||||
Review: https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/12#issuecomment-313
|
||||
@@ -1,7 +0,0 @@
|
||||
# PR #12 comment 348 follow-up
|
||||
|
||||
The review's process-isolation and oversized-output findings target the earlier `5eb4b2d` tree; both are addressed by `651b539` and remain covered by the real private-desktop and bounded-evidence regressions.
|
||||
|
||||
The remaining consent/result presentation gap is fixed here. The residual table retains its original six columns and adds confirmation scope and actual result. A row that was allowed at confirmation but rejected after a fresh activity/identity check now shows both facts beside its reason. The result message also counts confirmation-allowed rows and how many remain unreleased; it does not reinterpret preview consent as successful execution or bypass an active-write guard.
|
||||
|
||||
The new regression failed before the change. The release-dialog, residual follow-up and private-desktop regression group passed 35 tests. No production/native database action was performed. Integrated full validation is recorded at the PR #13 tip; no candidate build, merge or field acceptance is implied.
|
||||
@@ -1,53 +0,0 @@
|
||||
{
|
||||
"date": "2026-11-09",
|
||||
"review_url": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-319",
|
||||
"base_commit": "96e179ba6529eefd1401a012155cd7b7cbc0ffc3",
|
||||
"environment": {
|
||||
"python": "3.12.10",
|
||||
"windows": "10.0.26200"
|
||||
},
|
||||
"full_suite": {
|
||||
"tests": 1732,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"duration_seconds": 501.166,
|
||||
"xml": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795\\diagnostics\\cbb-refresh-verify-795-review-stack-fixes-full.xml",
|
||||
"xml_sha256": "578dd4b01db5c18ce657430ce3b2cd2dba8516d8191bdd31bf4e0df78187b3ba",
|
||||
"warnings": [
|
||||
"Existing pywinauto Revert to STA COM threading mode warning"
|
||||
]
|
||||
},
|
||||
"focused_suite": {
|
||||
"passed": 79
|
||||
},
|
||||
"compileall": "passed",
|
||||
"diff_check": "passed",
|
||||
"independent_review": "No remaining important findings in the scoped diff; durable completion feedback addressed",
|
||||
"tested_files_sha256": {
|
||||
"src/cbb_refresh_verify/desktop_worker.py": "173a951d510e78e088c439768ecfe31ab198723e7717b314b4a74a9d590a1fe0",
|
||||
"src/cbb_refresh_verify/library_lock.py": "391fb2f0b25f400676ba230472fb3bbd4a0d994ed5a8dfee46f8f32c7f198219",
|
||||
"src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638",
|
||||
"src/cbb_refresh_verify/native_management.py": "96c2fe613a657d110302c8f7cc033b91ef256e168036f4794eb39be475e69de8",
|
||||
"src/cbb_refresh_verify/residual_sessions.py": "a19622be3e959a7e64bf9de953450203499fb82618da8537307e5f61ef4d793b",
|
||||
"src/cbb_refresh_verify/session_record.py": "c4c5771d11d7469980c02f2fb264b26e5ee26634a37daae008dbb65097ab4e0c",
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "e46096ce784933f3ab47e4c316f3c84e3e5cf07242489323f6234b61aeb22f80",
|
||||
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "ec7566bac6d92845f98933bffd4c06f31eeec42946e69699aff94e31f9a8baef",
|
||||
"tests/test_incident_safety.py": "52f3ccb04db8971bf38628c2bd334d4fd79795e97de6538f6f66cb35f7123ece",
|
||||
"tests/test_integration.py": "9e9d30692607c889e1e3744a63c79c68e3af7d4c86804e0bcebe48e68765086c",
|
||||
"tests/test_management_supervision.py": "107196ce8a00dd76e7e3e83fb47ae2e67c857fa234492ba593bf71a7d7e1c5e5",
|
||||
"tests/test_residual_release_dialog.py": "7d2bf95afc2f9112b9433c7d2fefde3b35b5e85a70a6bd506471c039e2505509",
|
||||
"tests/test_review_319.py": "831fd34d426abb4436b9132bfb7ed754994155a34ac60a59378dee0964b54d28"
|
||||
},
|
||||
"not_verified": [
|
||||
"Frozen execution of this revision",
|
||||
"Real Mentor native writes/save/close during supervisor loss",
|
||||
"Windows 10",
|
||||
"Shared network/cross-machine release",
|
||||
"ICDB field recovery"
|
||||
],
|
||||
"automatic_icdb_repair": false,
|
||||
"candidate_rebuilt": false,
|
||||
"merged": false,
|
||||
"issue_closed": false
|
||||
}
|
||||
@@ -1,33 +0,0 @@
|
||||
# PR #13 review 319 validation
|
||||
|
||||
Review: https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-319
|
||||
|
||||
Baseline: `96e179ba6529eefd1401a012155cd7b7cbc0ffc3`.
|
||||
|
||||
## Changes
|
||||
|
||||
- Successful explicit resource proof acknowledges the retained queue entries captured before proof. The alias-set identity is a generation token: unrelated libraries and newer handoffs remain retained. Scoped proof acknowledges only the matching block.
|
||||
- Final observer outcomes remain available in the residual dialog after its observer ends. The existing refresh/confirm actions provide a running-session retry path. Successful release records a matching operation's RELEASED observation, so history refresh does not resurrect it as unconfirmed. Journal failure is reported separately from the established release fact.
|
||||
- Discovery observes process identities only. It never opens production databases exclusively, deletes coordination checkpoints, closes clients, or replays operations. Startup observers use the same read-only mode; only explicit release or already-authorized task reconciliation can establish resource release.
|
||||
- Supervisor loss sets cancellation independently of evidence-write success. An idle worker exits with code 75 only when its matching journal and synchronized in-memory phase both confirm no pending native write and every registered helper has exited. Missing/unknown/stale-active state retains the worker. The watchdog rechecks returned calls and cannot authorize a subsequent native write/helper. Native children are never terminated by this exit; worker exit is not database-release or Save-success evidence.
|
||||
- Worker phase persistence and watchdog journal reads share a gate to avoid a Windows sharing violation between reading the JSON and atomically replacing it. The dead `_terminate_pid` function is removed; cleanup tests observe actual process-termination boundaries.
|
||||
|
||||
## Verification
|
||||
|
||||
Commands run through the existing test wrapper with a dedicated mutex namespace and Qt offscreen; no user/native Mentor process is part of these fixtures.
|
||||
|
||||
```
|
||||
python -u -X utf8 diagnostics/run_review_fixes.py "F:/Sync Tool Skyworth/Work Maps/cbb-refresh-verify-795-review-stack"
|
||||
python -X utf8 -m compileall -q src tests
|
||||
git diff --check
|
||||
```
|
||||
|
||||
The focused session/watchdog/management/dialog/lease regression run passed 79 tests. The initial regressions were observed failing before the corresponding fixes: explicit proof left a library unavailable, history scan attempted release, orphan idle workers stayed alive, residual refresh omitted runtime records, and successful release reappeared as unconfirmed. Real harmless Windows subprocess fixtures cover PRECALL/POSTCALL, NATIVE_CALL/CLOSING, unknown/missing/stale journals, failed cancel/evidence writes, and rechecking after return.
|
||||
|
||||
Full-suite result is recorded in `2026-11-09-review-319-validation.json`. Independent review found no remaining P1/P2 in this scoped diff; its observation about durable completion was addressed and regression-tested.
|
||||
|
||||
## Limits
|
||||
|
||||
This is source/PR validation. The earlier `0.2.4b2-iconfix-44bb734` executable has not been rebuilt with these changes and must not be used as evidence for this revision. Its icon assets are preserved.
|
||||
|
||||
Not validated here: frozen execution of this revision, real Mentor Save/Close or library writes during supervisor loss, Windows 10, shared/network or cross-machine release. ICDB automatic Repair remains disabled. No field-recovery acceptance, merge, formal publication or issue closure is implied.
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,76 +0,0 @@
|
||||
# 2026-11-11:逐按钮模拟操作验证
|
||||
|
||||
基线:42e87190263453c8e3a7001d5768741b3b3a2c38。
|
||||
|
||||
全量 Python 测试 **1,835 passed**,只有既有的 STA COM 模式警告;Windows 私有桌面的界面组 **276 passed** 并正常退出。记录了 **281 次点击信号**、**78 种控件标识**和 **28 张代表性截图**。新增测试包含真实 Qt 文件选择和确认按钮、连点、停止、取消、窗口关闭和动态结果入口。
|
||||
|
||||
## 逐按钮模拟操作结果
|
||||
|
||||
Windows 原生 Qt 控件,独立私有桌面。48 个应用按钮/复选项全部触发点击信号,另验证 3 个菜单页签;276 项界面相关测试通过。
|
||||
|
||||
文件选择和确认框使用真实 Qt 对话框及其按钮;原生读写、恢复、保存、取消、强制结束均使用隔离替身。通过表示界面连接、参数、状态及错误处理通过,不表示真实 Mentor 操作通过。
|
||||
|
||||
| 控件 | 按钮 | 结果 | 验证点 |
|
||||
| --- | --- | --- | --- |
|
||||
| BackupRecoveryDialog.browse_button | 选择… | 通过 | 真实备份工程选择框打开/取消 |
|
||||
| BackupRecoveryDialog.restore_button | 恢复并校验 | 通过 | 无效来源拒绝;确认/拒绝;显示受控恢复结果 |
|
||||
| BackupRecoveryDialog.close_button | 关闭 | 通过 | 空闲关闭恢复窗口 |
|
||||
| BackupRecoveryDialog.cancel_queue_button | 取消排队 | 通过 | 取消等待票据,不调用恢复后端 |
|
||||
| MainWindow.native_lm_verify_check | 使用 Library Manager 原生 Verify(Win10 兼容测试) | 通过 | 勾选状态切换,原生 Verify 选项保持独立 |
|
||||
| MainWindow.advanced_toggle | 高级设置 | 通过 | 展开和收起高级设置 |
|
||||
| MainWindow.select_visible_button | 选择可见项 | 通过 | 只勾选可见条目 |
|
||||
| MainWindow.clear_selection_button | 清空选择 | 通过 | 清空勾选 |
|
||||
| MainWindow.load_button | 读取 CBB | 通过 | 读取当前库并更新清单 |
|
||||
| MainWindow.browse_button | 选择 | 通过 | 真实选择框打开/取消;取消不触发读取 |
|
||||
| MainWindow.selected_batch_button | 批量校验已选 | 通过 | 真实确认/拒绝;仅执行可见非 READY 已选项 |
|
||||
| MainWindow.batch_button | 校验可见非 READY | 通过 | 真实确认/拒绝;只执行可见非 READY 项 |
|
||||
| MainWindow.icdb_repair_button | ICDB 批量检查 | 通过 | 开始独立 ICDB 检查,不启用自动 Repair |
|
||||
| MainWindow.backup_restore_button | 从备份恢复 CBB… | 通过 | 为当前非 READY 目标打开备份恢复窗口 |
|
||||
| MainWindow.reimport_button | 选择工程副本恢复失败项… | 通过 | 副本恢复仍绑定失败 CBB |
|
||||
| MainWindow.stop_button | 当前项完成后停止 | 通过 | 设置停止标志,后续目标不再执行 |
|
||||
| MainWindow.logs_button | 打开日志目录 | 通过 | 打开正确目录;目录及系统打开失败时显示错误 |
|
||||
| MainWindow.recovery_button | 打开异常证据 | 通过 | 打开正确证据路径;系统打开失败时显示错误 |
|
||||
| MainWindow.native_backup_button | 版本历史与备份… | 通过 | 只启动一次;收到关闭回执后恢复可用 |
|
||||
| MainWindow.icdb_stop_button | 停止检查 | 通过 | 停止当前后台检查,不再打开后续项 |
|
||||
| MainWindow.add_button | 新增 CBB… | 通过 | 打开新增操作窗口 |
|
||||
| MainWindow.update_button | 用工程替换已选 CBB… | 通过 | 打开所选目标的更新窗口 |
|
||||
| MainWindow.remove_button | 移除已选… | 通过 | 打开所选目标的移除窗口 |
|
||||
| MainWindow.release_library_button | 释放残留会话… | 通过 | 打开当前库的释放预览 |
|
||||
| MainWindow.queue_release_button | 查看残留会话… | 通过 | 打开等待库的释放预览,关闭面板不误解锁任务 |
|
||||
| MainWindow.runtime_log_toggle | 查看运行日志 | 通过 | 显示/隐藏运行输出 |
|
||||
| ManagementDialog.sources_button | 选择来源工程… | 通过 | 真实工程选择框打开/取消并更新来源行 |
|
||||
| ManagementDialog.auto_verify | 本批次上传后自动校验 | 通过 | 切换本批次自动校验选项 |
|
||||
| ManagementDialog.release_wait_button | 查看残留会话… | 通过 | 传出等待释放的目标库 |
|
||||
| ManagementDialog.logs_button | 查看日志 | 通过 | 显示/隐藏管理日志 |
|
||||
| ManagementDialog.execute_button | 预览并确认执行… | 通过 | 真实确认/拒绝,重复点击不重复执行 |
|
||||
| ManagementDialog.stop_button | 当前项结束后停止 | 通过 | 设置管理任务停止标志 |
|
||||
| ManagementDialog.close_button | 关闭 | 通过 | 空闲关闭,执行中禁用点击不打断任务 |
|
||||
| PcbRestoreDialog.manual_button | 最后手动保存 | 通过 | 只选择最后手动保存版本,关闭不覆盖已有选择 |
|
||||
| PcbRestoreDialog.auto_button | 自动保存 | 通过 | 只选择自动保存版本,关闭不覆盖已有选择 |
|
||||
| PcbRestoreDialog.cancel_button | 取消 | 通过 | 取消选择,不默认回退版本 |
|
||||
| ResidualReleaseDialog.refresh_button | 重新检查 | 通过 | 重新扫描预览,不执行释放 |
|
||||
| ResidualReleaseDialog.confirm_button | 确认释放 | 通过 | 传递当前确认范围,显示实际释放结果 |
|
||||
| ResidualReleaseDialog.prompt_button | 处理保存提示… | 通过 | 真实是/否/取消,传递对应保存选择 |
|
||||
| ResidualReleaseDialog.details_button | 查看原生提示… | 通过 | 显示原生提示全文和详细信息 |
|
||||
| ResidualReleaseDialog.cancel_native_button | 请求原生取消… | 通过 | 真实确认/拒绝后发送受控取消请求 |
|
||||
| ResidualReleaseDialog.force_button | 强制结束客户端… | 通过 | 真实确认/取消后传递强制标志;未调用实际强杀 |
|
||||
| ResidualReleaseDialog.close_button | 关闭 | 通过 | 空闲关闭;执行中请求停止并等待当前项返回 |
|
||||
| Result.batch_release | 查看残留并释放… | 通过 | 从批量失败结果打开当前库释放入口 |
|
||||
| Result.batch_resume | 继续未执行项 | 通过 | 释放确认后只执行此前未执行的目标 |
|
||||
| Result.batch_copy | 选择副本恢复… | 通过 | 兼容维护结果中的副本恢复仍绑定失败工程 |
|
||||
| Result.icdb_release | 查看残留并释放… | 通过 | 从 ICDB 结果打开对应库释放入口 |
|
||||
| Result.icdb_copy | 选择副本恢复… | 通过 | 从 ICDB 结果打开对应失败工程的副本恢复 |
|
||||
|
||||
每项对应的测试编号、点击次数、完整事件记录及代表性截图见同目录 button-matrix.json / windows-all.json。
|
||||
|
||||
本轮额外修复:打开日志目录时,目录创建失败或系统拒绝打开不再向 Qt 事件循环抛出未处理异常,改用现有错误提示。
|
||||
|
||||
未验证:真实 Mentor 写库、ICDB 修复、Windows 10、跨机器共享库。
|
||||
|
||||
## 验证边界与构建记录
|
||||
|
||||
实际原生写库、历史回退、保存、原生取消及强制结束均使用隔离替身。未触碰现场工程或中心库,未证明 ICDB 原生修复成功;Windows 10 和跨机器共享库仍未验收。
|
||||
|
||||
首次候选构建因 C 盘空间不足在收集文件阶段失败,未计为通过。本轮未完成构建已迁至 F 盘继续,原候选和测试证据保留。最终构建及冻结验证结果见相邻验证 JSON。
|
||||
|
||||
逐按钮的测试编号与点击次数、界面 XML、截图路径和文件哈希保存在相邻验证 JSON 及其引用的本机证据中。截图只提供代表性界面,逐项结论以测试断言和点击记录为依据。
|
||||
@@ -1,210 +0,0 @@
|
||||
{
|
||||
"date": "2026-11-11",
|
||||
"baseline": "fdd07224aac99bee8d1f29e8e82d6a2c49964c87",
|
||||
"review_comment": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-381",
|
||||
"full_suite": {
|
||||
"tests": 1789,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 341.04
|
||||
},
|
||||
"focused_final": {
|
||||
"tests": 57,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 10.935
|
||||
},
|
||||
"windows_native_direct_runs": [
|
||||
{
|
||||
"tests": 21,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 14.625
|
||||
},
|
||||
{
|
||||
"tests": 21,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 11.765
|
||||
}
|
||||
],
|
||||
"windows_platform": {
|
||||
"platform": "windows",
|
||||
"desktop": "CbbUiReview381_ea1f0bcdc2",
|
||||
"exit_status": 0,
|
||||
"total": 21,
|
||||
"failures": 0,
|
||||
"mentor_calls": false
|
||||
},
|
||||
"inconclusive_windows_controller_run": {
|
||||
"controller_exit_code": 1,
|
||||
"assertion_total": 21,
|
||||
"assertion_failures": 0,
|
||||
"counted_as_pass": false,
|
||||
"controller_cause_confirmed": false,
|
||||
"followup": "Direct pytest launch and stack diagnostics; two direct runs exited 0."
|
||||
},
|
||||
"negative_control": {
|
||||
"expected_failure": true,
|
||||
"result": {
|
||||
"tests": 1,
|
||||
"failures": 1,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 3.75
|
||||
},
|
||||
"method": "Only baseline _queued_action restored in test memory; no source mutation."
|
||||
},
|
||||
"compileall_passed": true,
|
||||
"diff_check_passed": true,
|
||||
"tested_production_sha256": "a18d36f893f6e23b8e52b3d7e0b8cfba9ebfa08abb44acb54219cc092b318942",
|
||||
"full_run_file_hashes": {
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "a18d36f893f6e23b8e52b3d7e0b8cfba9ebfa08abb44acb54219cc092b318942",
|
||||
"tests/test_review381_queue_release.py": "56661d607b55d1284fad69105d4457ab6816696a998188d6986ed67765b326e0",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328"
|
||||
},
|
||||
"final_file_hashes": {
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "a18d36f893f6e23b8e52b3d7e0b8cfba9ebfa08abb44acb54219cc092b318942",
|
||||
"tests/test_review381_queue_release.py": "e568a2701337be068af91a03ff3451d82c705109a7b62c3c11663a42bcf552b5",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328"
|
||||
},
|
||||
"test_refinement_after_full": "Only one test gained an admission barrier; production unchanged; focused and Windows rerun.",
|
||||
"candidate_rebuilt": true,
|
||||
"candidate_executable": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\dist\\CbbRefreshVerify-Background\\CbbRefreshVerify.exe",
|
||||
"bundle": {
|
||||
"module_count": 62,
|
||||
"source_and_frozen_code_equal": true,
|
||||
"source_sha256_checked": true,
|
||||
"packaged_assets_equal": true,
|
||||
"exe_icon_images_equal": true,
|
||||
"executable_sha256": "71812c1fdfa6522fad4468f4ca4c7d8f77aa9c6880b70f0d8b7ad58a31d55ec2"
|
||||
},
|
||||
"frozen_smoke": {
|
||||
"gui": {
|
||||
"status": "passed",
|
||||
"exit_code": 0
|
||||
},
|
||||
"verify-worker": {
|
||||
"exit_code": 1,
|
||||
"status": "passed",
|
||||
"evidence": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\smoke-319c4ff4\\verify-worker"
|
||||
},
|
||||
"management-worker": {
|
||||
"exit_code": 2,
|
||||
"status": "passed",
|
||||
"evidence": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\smoke-319c4ff4\\management-worker"
|
||||
},
|
||||
"owner-probe": {
|
||||
"exit_code": 0,
|
||||
"status": "passed",
|
||||
"evidence": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\smoke-319c4ff4\\owner-probe"
|
||||
},
|
||||
"dialog-agent": {
|
||||
"status": "passed",
|
||||
"exit_code": 0,
|
||||
"scope": "empty PID set, observe only"
|
||||
},
|
||||
"module_origins": {
|
||||
"status": "passed",
|
||||
"module_count": 62,
|
||||
"source_root": "F:\\Sync Tool Skyworth\\Work Maps\\cbb-refresh-verify-795-review-stack\\src"
|
||||
},
|
||||
"version": "0.2.4b2"
|
||||
},
|
||||
"independent_review": {
|
||||
"scope": "review381 and directly related stale/cross-task release UI",
|
||||
"reviewer": "review381_final",
|
||||
"reviewed_files": [
|
||||
"src/cbb_refresh_verify/ui/main_window.py",
|
||||
"tests/test_review381_queue_release.py"
|
||||
],
|
||||
"finding": "foreground completion erased independent background wait",
|
||||
"followup": "fixed; both completion orders reproduced failing then passing",
|
||||
"final_review": "no additional findings",
|
||||
"review_native_calls": false
|
||||
},
|
||||
"native_mentor_operations_verified": false,
|
||||
"icdb_repair_accepted": false,
|
||||
"field_library_modified": false,
|
||||
"windows10_verified": false,
|
||||
"shared_library_verified": false,
|
||||
"merged": false,
|
||||
"artifacts": {
|
||||
"review381-baseline.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-baseline.xml",
|
||||
"sha256": "f224548b02b5841f7d3148375eea50f6505c83af912b66a7d67c5d572bc287b3"
|
||||
},
|
||||
"review381-red-controlled.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-red-controlled.xml",
|
||||
"sha256": "15c620cb4ec251501d83fd7ebc4ee654df8b0e4b7aa8f8ccb2d7af30ec162c5f"
|
||||
},
|
||||
"review381-interleaved-red.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-interleaved-red.xml",
|
||||
"sha256": "fea4342c4bdab3b03e70f70585e66281188ac80ae7613e4bf7db9fcd616ce1f5"
|
||||
},
|
||||
"review381-completion-red.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-completion-red.xml",
|
||||
"sha256": "6dab11fbba7878db81885f5d11fadc5c80728a9dab3cab8edd0883cb7015d3e2"
|
||||
},
|
||||
"review381-full.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-full.xml",
|
||||
"sha256": "9f73a2dddae8831c2bad4ae1fb2f2f509b1981508a512fffb208dce1a858860f"
|
||||
},
|
||||
"review381-focused-barrier.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-focused-barrier.xml",
|
||||
"sha256": "ec7fd3dc3ce869b97ed3f22e7e9528f60dc8512a89e451eae434fe665bae838a"
|
||||
},
|
||||
"review381-admission-negative-control.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-admission-negative-control.xml",
|
||||
"sha256": "ecb66304ee5cc1be9c19c4ba33c57a7bd86e65b156a959fa5665cba2274679e9"
|
||||
},
|
||||
"review381-windows-direct-first.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-windows-direct-first.xml",
|
||||
"sha256": "3ba672a9190a5ec715ae99db01c0faca1b3bfcfe9d25a25ba46309af7f5c1880"
|
||||
},
|
||||
"review381-windows-direct-first-platform.json": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-windows-direct-first-platform.json",
|
||||
"sha256": "a255f39b48fe69656c553b6a4feff6f905beb1e18ba2de9724454f15d3d8ea56"
|
||||
},
|
||||
"review381-windows.xml": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-windows.xml",
|
||||
"sha256": "a2d53895c5afaf0907a670d544cd98db6c786bbf75f2e520ac0355d3c4a88ff2"
|
||||
},
|
||||
"review381-windows-platform.json": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-windows-platform.json",
|
||||
"sha256": "e06d76c1c2c297f6d4e11f76a903666a1bdf47cdc81a26a295c2040ef9381bbb"
|
||||
},
|
||||
"review381-independent-review.json": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-independent-review.json",
|
||||
"sha256": "155c0b1c4ae3ecb5b94b1a2d321e47b96a4885f18cc369f36c82408b20959981"
|
||||
},
|
||||
"review381-candidate/source-sha256.json": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\source-sha256.json",
|
||||
"sha256": "6028d5cb3f6eeec68ae938fb73223d5343de7c8671ba3b77d9a1d1e6faa37608"
|
||||
},
|
||||
"review381-candidate/bundle-verification.json": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\bundle-verification.json",
|
||||
"sha256": "08117158e59192c7ee7f0538968b24d5e4cb8e9f8f230636bd009aa39ffbc4b5"
|
||||
},
|
||||
"review381-candidate/smoke-319c4ff4/result.json": {
|
||||
"path": "C:\\Users\\ABS_Windows\\.codex\\visualizations\\2026\\11\\02\\01a19b86-b23f-7fe0-9407-45a4303e10e3\\review381-candidate\\smoke-319c4ff4\\result.json",
|
||||
"sha256": "3cefd58746044c0f48455aba9796b0a30687ee5a30084fa1948449e5094c1a10"
|
||||
}
|
||||
},
|
||||
"committed_file_hashes": {
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "a18d36f893f6e23b8e52b3d7e0b8cfba9ebfa08abb44acb54219cc092b318942",
|
||||
"tests/test_review381_queue_release.py": "e0d62424cbf70ec9573db78ede0a4c6534775399194eed4c6b28ba8d468307be",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328"
|
||||
},
|
||||
"post_validation_whitespace_cleanup": "Trimmed one trailing blank line in test file; compiled test code equal; staged diff check rerun."
|
||||
}
|
||||
@@ -1,43 +0,0 @@
|
||||
# PR #13 评论 381:等待入口与交错操作验证
|
||||
|
||||
对应审查:<https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-381>。基线为 `fdd07224aac99bee8d1f29e8e82d6a2c49964c87`。
|
||||
|
||||
## 修复行为
|
||||
|
||||
校验获得原生执行机会后,立即刷新执行状态和残留入口。入口显示及点击均复核现有的内存保留状态,已释放的库不会因旧消息或延迟点击重新打开释放面板。窗口进入关闭流程后,不接受新的释放面板请求。
|
||||
|
||||
等待消息在覆盖当前目标前,同样检查消息所指库现在是否仍被保留。另一个库的普通排队消息、已过期的保留消息或 ICDB 开始事件,不会抹掉仍有效的等待入口。
|
||||
|
||||
独立复查补充发现:前台任务结束会清除另一个库正在等待的后台 ICDB 入口。现在前台结束时保留该后台任务的有效入口;后台取消或结束时,移除属于它的过期入口,同时保留同库前台仍需要的入口。路径比较使用已知别名,不查询磁盘、网络或 WMI。
|
||||
|
||||
没有新增库锁、占用扫描、轮询线程或强制结束逻辑。原生执行仍串行;未确认释放时的同库保护和自动 Repair 关闭状态不变。本次不调整整批调度。
|
||||
|
||||
## 实际执行的验证
|
||||
|
||||
| 验证 | 结果 |
|
||||
| --- | --- |
|
||||
| 既有队列入口基线 | 7 通过 |
|
||||
| 原问题及交错操作,修复前 | 7 失败、2 通过;随后扩展的交错用例另有 3 项预期失败 |
|
||||
| 前台结束/后台取消两种顺序,修复前 | 2 项均失败 |
|
||||
| 全量 Python 测试 | 1,789 通过、0 失败、0 跳过;既有 STA COM 模式警告 1 项 |
|
||||
| 加强并发屏障后的相关回归 | 57 通过 |
|
||||
| Windows 原生 Qt 控件,独立私有桌面 | 21 项通过;直接启动的最终验证记录另存 JSON/XML |
|
||||
| 负向对照 | 仅在测试进程内恢复旧的队列接纳方法,新用例稳定失败;不修改源文件 |
|
||||
| 编译及差异检查 | `compileall` 和 `git diff --check` 通过 |
|
||||
| 新冻结候选包 | 5 项冒烟通过;62 个包内模块与源码一致;包内图标及 EXE 图标资源一致 |
|
||||
|
||||
全量测试后仅加强了一个测试的时序屏障,业务源码没有再变化;加强后的测试文件已重新执行相关回归和 Windows 控件验证。全量时与最终测试文件的哈希分别保留。
|
||||
|
||||
新增的 14 项用例覆盖:执行尚未结束时隐藏旧入口;五次延迟点击;过期等待消息;独立库事件交错;反复打开、关闭和重开面板;重复点校验后停止再点释放;前后台任务先后结束;关闭过程中送达的点击。控件点击使用真实 PySide6 控件与事件循环;库数据和原生扫描采用隔离替身,不操作现场库。
|
||||
|
||||
一次较长启动链的 Windows 验证中,21 项断言均通过,但外层控制器返回 1,未计为完整通过。随后缩短验证启动链,直接启动 pytest,并加入超时堆栈记录;直接运行的正常退出结果单独保留。不能据此把那次控制器异常认定为已复现的业务故障,也不隐去该次未完成验证。具体记录见相邻验证 JSON。
|
||||
|
||||
## 候选包与边界
|
||||
|
||||
新包位置记录于 `2026-11-11-pr13-review381-validation.json`,构建和验证产物保存在本机 Codex visualizations 目录。EXE SHA-256:
|
||||
|
||||
`71812c1fdfa6522fad4468f4ca4c7d8f77aa9c6880b70f0d8b7ad58a31d55ec2`
|
||||
|
||||
冻结冒烟包括 GUI 创建及正常退出、启动前取消的 Verify worker、桌面不匹配时拒绝操作的管理 worker、空所有者查询,以及私有桌面上空 PID 范围的弹窗观察。后四项是受控边界验证,不代表真实原生操作成功。
|
||||
|
||||
本轮未执行真实 Mentor Save/Close/Add/Remove 或 ICDB 修复,未写入现场中心库;也未验证 Windows 10、跨机器共享库或现场故障一致副本。不能将本次界面和生命周期验证作为 ICDB 自动修复成功的依据。不合并发布、不关闭现场工单。
|
||||
@@ -1,235 +0,0 @@
|
||||
# 当前程序流程、阻塞点与错误节点
|
||||
|
||||
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
|
||||
|
||||
> 这是修改前 `42d0ceb` 的流程快照。后续修复及真实复测见 [占用范围验证](2026-11-12-scoped-release-validation.md)。
|
||||
|
||||
依据提交 `42d0cebc54191681b53dcecb120f53236c1963bb` 的代码及 2026-11-12 冻结程序原生验收记录。本文件只分析当前行为,没有实施下面建议的调整,也没有新增原生验收。
|
||||
|
||||
后续只读核查已用外部软件自身日志确认 E01 的两个未知阻塞进程来自 DxPartReplace 测试,创建时间、父进程和私有桌面交叉匹配;外部工程引用原库,本次 CBB 验收使用隔离库。详见 [进程来源核查](2026-11-12-process-origin-audit.md)。这进一步确认了并行软件触发本程序范围判定漏洞,不能将其解释成本程序自身客户端未退出。
|
||||
|
||||
红色 E 节点表示真实验收已经发生、仍未解决的问题;橙色 B 节点表示代码中确实存在的等待、拒绝或失败分支,但不表示每个条件都已复现;绿色 F 表示本轮修复并复测通过的位置。各入口在 UI 中独立,底层原生调用仍共享串行通道。
|
||||
|
||||
## 一、最需要处理的阻塞链
|
||||
|
||||
```mermaid
|
||||
flowchart LR
|
||||
A[单个 CBB 失败或被停止] --> B[PCB 或助手未确认退出]
|
||||
B --> C[safe_to_continue 为 false]
|
||||
C --> D[B02 同库后续项被跳过]
|
||||
C --> E[B01 后续任务等待库可用]
|
||||
E --> F[用户打开释放窗口]
|
||||
F --> G[正常关闭本工具 PCB]
|
||||
G --> H[E01 其他任务的未知会话也被纳入必须退出的集合]
|
||||
H --> I[整库释放仍为 PARTIAL]
|
||||
I --> E
|
||||
classDef error fill:#fee2e2,stroke:#dc2626,color:#7f1d1d
|
||||
classDef risk fill:#fff3cd,stroke:#d97706,color:#78350f
|
||||
class H,I error
|
||||
class D,E risk
|
||||
```
|
||||
|
||||
这条链中的核心缺陷是:**当前项是否失败、当前项是否留下占用、整个库能否继续、其他工具是否正在运行,没有彻底分开。** 某项失败但 `safe_to_continue=true` 时,当前代码会继续处理下一项,真实多来源新增已验证这一点;`false` 则会阻止同库后续项,不能称为“所有失败都不会影响整批”。
|
||||
|
||||
## 二、阻塞与失败清单
|
||||
|
||||
| 标记 | 发生位置与触发条件 | 当前后果、影响范围 | 证据与处理方向 |
|
||||
| --- | --- | --- | --- |
|
||||
| **E01 已复现、未修复** | 释放集合包含 scope_confirmed=false 的其他任务进程;释放函数要求全部观察项 RELEASED;底层证明也把没有目标路径的进程作为可能占用 | 本工具 PCB 已退出,整库仍 PARTIAL;保留状态无法清除,同库后续任务继续等或被跳过 | R7 的 PCB 21856/21248 均退出;其他任务 viewdraw 29832 为 WAITING。必须区分观察项与本库目标,并用目标资源证明决定能否继续,不能直接结束其他任务 |
|
||||
| **E02 已复现、未走通** | PCB 启动出现原生“确认无其他用户,以读写权限继续”提示 | 当前打开判为 DATABASE_SAFETY_STOP;普通校验未 READY,ICDB 检查无法确认,备份副本不安装。关闭成功时本项失败仍可安全继续 | 该正文不直接证明 ICDB 损坏。代码有受限的修复后授权分支,但不是普通打开时通用的用户确认入口 |
|
||||
| **E03 已复现、未修复** | A/B 来源工程的原生 EDIF 导出器退出 0xC0000005 | 本项上传失败;退出及资源释放证明成功后下一项继续,不能跳过身份比对报告成功 | 相同批次 C 能新增成功。需进一步定位原生导出与输入兼容性 |
|
||||
| **B01 可长期排队** | NativeQueue 没有排队总超时;等待 active=false 且本库 library_available=true | UI 线程保持运行,但普通校验、管理、刷新等任务可能一直显示等待;可取消排队。活动任务未返回时,即使不同库也不能使用同一个原生通道 | 属于后台任务等待,不等于界面卡死;不同库且条件满足的票据可以越过暂不可用票据。需要展示等待对象、阶段及下一步,而不是单一“忙” |
|
||||
| **B02 失败传播到同库** | run_batch、run_management_batch、IcdbCheckTask 遇 safe_to_continue=false;未知异常也可能保守置 false | 同库后续项 SKIPPED;其他库不因这个集合被跳过;CANCELLED/QUEUE_STOP 或用户停止会停止余下队列 | 现有规则确实仍会让单项占用影响本库整批。后续需分辨仅此工程占用与共享库占用,不能盲目把 false 改 true |
|
||||
| **B03 执行互斥与协调锁** | Windows 会话级 Local/CbbRefreshVerify795 被占用;库协调锁被持有;历史 blocked/pending 记录存在或身份不符 | 直接拒绝本次操作,或先复核旧记录;未确认时保留本库协调锁/记录 | 多个应用实例、独立上传工具、崩溃遗留均可能触发。历史记录本身不是仍在写库的证明 |
|
||||
| **B04 地址、数据库、在途调用** | 存在 sAddress.adr;数据库/LMC/Layout 独占读失败;仍有本库原生写入或导出副本所有者 | 当前操作或释放证明失败;真实在途写入应继续保护。陈旧地址和不完整日志也可能导致无法确认 | 当前主要哈希排除地址文件,但占用判断仍会使用它们;不能用“哈希忽略了”推断“占用也已忽略” |
|
||||
| **B05 原生调用未返回** | Add/Remove/COM 调用或原生进程超过监督时限 | 有些监督入口返回超时并保留真实 worker;真实写入继续观测;CleanWGLib 超时后仍等待其自然退出,不能把超时当释放 | 可能同时占着执行通道、库锁或保留状态。需要区分取消未开始项、请求原生取消、仍在写入、可以关闭的客户端 |
|
||||
| **B06 原生版本窗口仍打开** | iCDB Project Backup 原生窗口尚未关闭,或关闭结果未确认 | 同库校验/恢复受到限制;同库 ICDB 后台检查会暂停,关闭并确认后恢复;不是自动修复失败 | 这是实际原生编辑会话的互斥。不能通过关闭应用或删除记录假装窗口已关闭 |
|
||||
| **B07 格式、能力与来源校验** | 缺失/越界引用、不支持的版本或接口、目标分区不唯一、来源同名不匹配、未完成变更记录仍需恢复 | 本项拒绝;新增遇同名冲突明确失败;未完成写操作不会在重启后自动重放 | 这些多数属于输入/恢复边界;要给出具体原因和可纠正入口,不能混成 ICDB 问题 |
|
||||
| **B08 来源/目标内容变化** | 暂存复制前后文件集合或主要哈希变化;基线后中心库更新;恢复前来源或目标变化 | 停止当前写入或恢复。更新已 Remove 但尚未 Add 成功时可能 RECOVERY_REQUIRED | 应保留阶段、原 Work 或人工备份路径;不能把部分成功视为整体成功 |
|
||||
| **B09 权威状态与工程身份** | 保存/关闭失败;注册内容不符;中心库复读失败;校验后不是 GREEN/READY | 当前项不通过;是否影响后续取决于释放事实。上传成功可为 UPLOADED,但不等于 UPLOADED_VERIFIED | 不能仅以 PCB 窗口打开、COM 返回或文件目录存在判成功 |
|
||||
| **B10 IO、路径与证据存储** | 网络盘不可见、路径映射失败、证据目录不可写、检查点变化、空间不足 | 读取/当前任务失败;关键写前检查点保存失败时不开始写入;某些辅助诊断写入失败只记录警告 | 网络/磁盘与原生数据库错误要分开报告;恢复需先复制验证库,因此有实际容量和耗时 |
|
||||
| **B11 程序关闭等待** | 关闭时检查仍活动、当前任务仍忙、线程池或路径租约操作仍未结束 | 首次关闭可能只请求停止;进入关闭流程后等线程池/租约结束,代码没有统一关闭总超时 | R7 正常退出通过,不代表 COM 永久不返回场景也能退出;需要单独验收这一条件 |
|
||||
| **F01 已修复复测** | 原生私有桌面 GetThreadDesktop 拒绝访问;重新 OpenDesktop 后 HWND 不可读 | 之前误报窗口归属变化,无法正常释放 | 已改为有界桌面枚举、映射窗口后再核对 PID,真实 PCB 正常取消退出通过 |
|
||||
| **F02 已修复复测** | 状态刷新期间结果窗口的释放按钮仍可点击,函数因 busy 直接返回 | 之前按钮点击无窗口 | 已跟随 busy/排队目标更新,R7 先禁用后可用,点击能打开释放窗口;不等于 E01 已解决 |
|
||||
|
||||
另有 **P2 结果展示错误**:释放数量包含自然退出且未允许操作的观察项,因此出现“已释放 4 个,确认允许 2 个”。这是统计问题,不是解除占用的证明。
|
||||
|
||||
## 三、完整业务流程总图
|
||||
|
||||
下图按实际任务边界展开:所有菜单可以独立提交请求;排队串行的是 Mentor 原生操作。为保持图可读,把共享的 PCB 子流程和释放子流程放在后两张展开图中,节点 V、R 在各图中指向同一过程。
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
START[启动桌面应用] --> INIT[配置日志、加载原生能力、异步发现未完成任务]
|
||||
INIT --> LIB[选择中心库并建立路径映射 B10]
|
||||
LIB --> READ[读取 CBB、工程文件及权威状态 B07 B09]
|
||||
READ --> LIST[搜索、筛选、可见项勾选]
|
||||
LIST --> OP{选择独立操作入口}
|
||||
|
||||
OP --> VERIFY[检验:只取可见非 READY 项]
|
||||
OP --> CHECK[ICDB 批量检查:只取可见非 READY 项]
|
||||
OP --> HISTORY[版本历史与备份:单个非 READY 项]
|
||||
OP --> RECOVER[从完整工程备份恢复:非 READY 项]
|
||||
OP --> MANAGE[中心库管理:READY 可更新或移除]
|
||||
OP --> R[释放残留:进入释放子流程]
|
||||
|
||||
VERIFY --> CONFIRM[显示目标与确认;写操作提示人工备份]
|
||||
CHECK --> CONFIRM
|
||||
HISTORY --> ADMIT
|
||||
RECOVER --> CONFIRM
|
||||
MANAGE --> CONFIRM
|
||||
CONFIRM --> ADMIT[原生队列准入 B01:可取消;按目标库保留状态判断]
|
||||
ADMIT --> DISPATCH{任务类型}
|
||||
DISPATCH -->|普通校验| V[共享 PCB 打开、弹窗、校验、关闭子流程 E02]
|
||||
DISPATCH -->|检查| CITEM[每项重新判断 READY 和内容是否更新]
|
||||
CITEM -->|应跳过| RESULT
|
||||
CITEM -->|应检查| CV[调用 V;仅诊断打开,不保存校验、不 Repair]
|
||||
CV --> CLASSIFY{本次错误正文含 ICDB 特征吗}
|
||||
CLASSIFY -->|正常打开并关闭| CLEAN[CHECKED;不等于 READY]
|
||||
CLASSIFY -->|含有特征| ICERR[报告 ICDB 问题;不执行自动修复]
|
||||
CLASSIFY -->|其他弹窗或无法打开| UNCERTAIN[无法确认;保留原错误 E02]
|
||||
CLEAN --> RESULT
|
||||
ICERR --> RESULT
|
||||
UNCERTAIN --> RESULT
|
||||
|
||||
DISPATCH -->|版本管理| HOPEN[绑定工程后打开原生备份窗口 B06]
|
||||
HOPEN --> HUSER[用户查看、创建备份或选择版本回退]
|
||||
HUSER --> HCLOSE[等待窗口正常关闭、释放结果及状态复读 B06 B09]
|
||||
HCLOSE --> RESULT
|
||||
|
||||
DISPATCH -->|备份恢复| BVALID[来源身份、路径、文件、空间检查 B07 B10]
|
||||
BVALID --> BCOPY[复制隔离验证库与备份工程 B08]
|
||||
BCOPY --> BV[调用 V:在副本校验 E02]
|
||||
BV --> BOK{PASS、GREEN 且安全释放}
|
||||
BOK -->|否| BUNCHANGED[恢复失败;目标不安装]
|
||||
BOK -->|是| BCOMPARE[复核来源和目标未变化 B08]
|
||||
BCOMPARE --> INSTALL[旧 Work 改名保留,再安装副本 B08 B10]
|
||||
INSTALL --> TV[调用 V:重新打开实际目标 B09]
|
||||
TV --> RESULT
|
||||
BUNCHANGED --> RESULT
|
||||
|
||||
DISPATCH -->|管理| MPRE[原生能力、来源、历史任务、库锁检查 B03 B07]
|
||||
MPRE --> MCAT[原生目录复读并核对名称和分区 B09]
|
||||
MCAT --> MBASE[记录内容基线;来源工程复制暂存 B08]
|
||||
MBASE --> MOP{新增、更新或移除}
|
||||
MOP -->|新增或更新| EXPORT[原生 ASCII、CSV、EDIF 身份导出 E03]
|
||||
EXPORT --> MWRITE[新增 Add;更新 Remove 后 Add B05 B08]
|
||||
MOP -->|移除| REMOVE[原生 Remove B05]
|
||||
MWRITE --> MREAD[目录复读、内容身份及释放核对 B09]
|
||||
REMOVE --> MREAD
|
||||
MREAD --> AUTO{新增或更新启用自动校验吗}
|
||||
AUTO -->|是| MV[调用 V 进行校验;上传成功与校验成功分别记录]
|
||||
AUTO -->|否或移除| RESULT
|
||||
MV --> RESULT
|
||||
|
||||
V --> RESULT[逐项记录结果、阶段、证据与释放事实]
|
||||
RESULT --> SAFE{safe_to_continue}
|
||||
SAFE -->|true| NEXT[继续下一项;ICDB 检查在每项之间让出原生队列]
|
||||
SAFE -->|false| RETAIN[B02 保留本库会话状态;同库余项跳过]
|
||||
RETAIN --> R
|
||||
NEXT --> MORE{还有任务且未停止吗}
|
||||
MORE -->|是| ADMIT
|
||||
MORE -->|否| REFRESH[刷新受影响条目的权威状态 B09;生成报告 B10]
|
||||
REFRESH --> LIST
|
||||
R -->|证明成功| RESUME[清理本库保留状态;必要时用户继续未执行项]
|
||||
R -->|未确认 E01| RETAIN
|
||||
RESUME --> LIST
|
||||
LIST -->|关闭应用| EXIT[停止当前任务并等待线程池、租约结束 B11]
|
||||
EXIT --> END[程序退出]
|
||||
|
||||
classDef error fill:#fee2e2,stroke:#dc2626,color:#7f1d1d
|
||||
classDef risk fill:#fff3cd,stroke:#d97706,color:#78350f
|
||||
classDef good fill:#dcfce7,stroke:#16a34a,color:#14532d
|
||||
class V,CV,UNCERTAIN,BV,EXPORT,R error
|
||||
class LIB,READ,ADMIT,HOPEN,HCLOSE,BVALID,BCOPY,BCOMPARE,INSTALL,TV,MPRE,MCAT,MBASE,MWRITE,REMOVE,MREAD,RETAIN,REFRESH,EXIT risk
|
||||
class CLEAN,RESUME good
|
||||
```
|
||||
|
||||
图中的“回到队列”是下一次任务准入的概览:当前普通校验和管理批次在批次外围占用队列;ICDB 检查每完成一个 CBB 才释放并重新排队,不能理解为三种批次都已经逐项让出通道。读取/状态刷新也会使用原生队列,纯内存搜索与筛选不启动 Mentor。
|
||||
|
||||
## 四、共享 PCB 任务展开图 V
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
V[开始:普通校验、检查或恢复副本校验] --> GATE[取得会话互斥、复核历史释放、取得库锁 B03 B04]
|
||||
GATE --> PRE[检查 PRJ、PCB、依赖和证据目录 B07 B10]
|
||||
PRE --> CONTENT{普通校验且配置了额外内容检查吗}
|
||||
CONTENT -->|是| EXTRA[Importer 内容检查;失败结束本项]
|
||||
CONTENT -->|否| LAUNCH
|
||||
EXTRA -->|通过| LAUNCH[创建私有桌面与监督 worker;启动 PCB B05]
|
||||
EXTRA -->|失败| FAILURE
|
||||
LAUNCH --> OPEN{原生打开结果}
|
||||
OPEN -->|读写确认提示| PERMISSION[E02 普通入口缺少通用授权交互;当前安全停止]
|
||||
OPEN -->|可识别版本选择| VERSION[用户选最后手动保存、自动保存或取消;适用入口才提供]
|
||||
OPEN -->|其他错误或未知弹窗| FAILURE[本项失败,记录实际文本或超时 B05]
|
||||
OPEN -->|打开完成| MODE{仅诊断打开吗}
|
||||
VERSION -->|可继续| OPEN
|
||||
VERSION -->|取消| FAILURE
|
||||
MODE -->|是| DIAG[证明目标已打开;请求关闭,不执行保存校验]
|
||||
MODE -->|否| VERIFY[实际原生校验、保存、关闭 B05 B09]
|
||||
VERIFY --> READY[中心库权威复读:必须 GREEN/READY B09]
|
||||
PERMISSION --> CLOSE
|
||||
FAILURE --> CLOSE
|
||||
DIAG --> CLOSE[正常关闭、取消已知启动弹窗、释放 COM 和自动化助手]
|
||||
READY --> CLOSE
|
||||
CLOSE --> OWNERS[确认 worker、PCB、启动器和目标资源已释放 B04;桌面访问 F01 已修复]
|
||||
OWNERS -->|成功| OUT[返回本项业务结果,safe_to_continue=true]
|
||||
OWNERS -->|失败或无法确认| RETAIN[保留证据与会话,safe_to_continue=false,触发 B02]
|
||||
classDef error fill:#fee2e2,stroke:#dc2626,color:#7f1d1d
|
||||
classDef risk fill:#fff3cd,stroke:#d97706,color:#78350f
|
||||
class PERMISSION error
|
||||
class GATE,PRE,LAUNCH,FAILURE,VERIFY,READY,OWNERS,RETAIN risk
|
||||
```
|
||||
|
||||
普通校验和检查都不默认启动自动 Repair。仓库中仍保留修复与修复后授权代码,但当前桌面批量检查路径明确关闭自动修复,不能把存在函数等同于产品入口已接通。
|
||||
|
||||
## 五、释放任务展开图 R
|
||||
|
||||
```mermaid
|
||||
flowchart TD
|
||||
R[主窗口或结果窗口点击释放] --> UI[校验当前目标与按钮可用状态 F02 已修复]
|
||||
UI --> SCAN[异步枚举进程、线程桌面、窗口、历史会话]
|
||||
SCAN --> GROUP{能证明属于本库吗}
|
||||
GROUP -->|是| TARGET[可确认的目标客户端]
|
||||
GROUP -->|否| OBSERVE[归属未知,只允许观察]
|
||||
TARGET --> CONSENT[用户确认正常关闭;可查看原生提示]
|
||||
CONSENT --> ACTION[重新核对 PID、创建时间、映像、窗口后正常关闭 F01 已修复]
|
||||
ACTION --> PROMPT{还有原生提示吗}
|
||||
PROMPT -->|保存提示| SAVE[用户保存、放弃或保留;真实分支尚未完整验收]
|
||||
PROMPT -->|支持取消的活动窗口| CANCEL[确认后请求原生 Cancel;不当成取消已完成]
|
||||
PROMPT -->|无| EXITCHECK
|
||||
SAVE --> EXITCHECK[观察真实进程是否退出]
|
||||
CANCEL --> EXITCHECK
|
||||
EXITCHECK --> ALL{当前代码:所有观察项都 RELEASED 吗}
|
||||
OBSERVE --> ALL
|
||||
ALL -->|否| ERROR[E01 未归属本库的其他任务也会让整体 PARTIAL]
|
||||
ALL -->|是| PROOF[持有证明句柄检查本库、共享库、地址、导出副本和在途调用 B04]
|
||||
PROOF --> UNKNOWN[E01 底层仍可能把路径未知进程当候选占用]
|
||||
UNKNOWN -->|不能证明| ERROR
|
||||
UNKNOWN -->|证明成功| RECORD[归档匹配的历史记录,清理对应保留状态及映射]
|
||||
RECORD --> RELEASED[RELEASE_CONFIRMED;允许重新尝试]
|
||||
ERROR --> WAIT[B01 队列仍等或 B02 本库余项已跳过;显示残留原因]
|
||||
WAIT -->|用户重新检查| SCAN
|
||||
classDef error fill:#fee2e2,stroke:#dc2626,color:#7f1d1d
|
||||
classDef risk fill:#fff3cd,stroke:#d97706,color:#78350f
|
||||
classDef fixed fill:#dcfce7,stroke:#16a34a,color:#14532d
|
||||
class ALL,ERROR,UNKNOWN error
|
||||
class PROOF,WAIT,SAVE,CANCEL risk
|
||||
class UI,ACTION,RELEASED fixed
|
||||
```
|
||||
|
||||
强制结束是另一个需要确认的分支:只针对已确认归属、符合条件的客户端,不能结束数据库服务器或归属未知进程;本轮真实操作只验收了打开确认后取消,没有执行强制终止。它不会消除 E01,不能作为释放判断错误的替代方案。
|
||||
|
||||
## 六、代码位置与四层协调机制
|
||||
|
||||
| 机制 | 位置 | 控制范围 |
|
||||
| --- | --- | --- |
|
||||
| 原生队列 | `operation_queue.py:18`、`ui/main_window.py:844`、`ui/management_dialog.py:174` | 应用内一次执行一个原生任务;按库保留状态允许其他可运行票据越过等待项 |
|
||||
| Windows 会话互斥 | `verify_runner.py:547`、`management.py:172`、`backup_recovery.py:145` | 同一 Windows 会话中的本工具原生调用;不是每工程独立互斥 |
|
||||
| 库协调锁与历史阻止记录 | `library_lock.py:129`、`:443`、`:523` | 按中心库控制写入与释放;历史记录需复核,不能直接删除当成功 |
|
||||
| 运行时保留状态 | `session_record.py:25`、`:236`、`:354`、`:443` | 原生队列准入、助手与客户端身份观测;日志阶段不等于真实进程状态 |
|
||||
| 导出副本所有权 | `native_export_guard.py:10`、`native_engineering_identity.py:288` | 防止原生导出器仍持有分析副本时释放相关操作 |
|
||||
|
||||
关键传播代码:`verify_runner.py:1294`、`management.py:430`、`ui/icdb_check_task.py:55`。E01 的双重判定:`residual_sessions.py` 中 `_release_residual_sessions` 的全部行 RELEASED 条件,以及 `library_lock.py:443` 的 `_prove_library_released`。E02:`dialog_rules.py:222`、`verify_runner.py:895`。E03:`native_engineering_identity.py:288`。退出等待:`ui/main_window.py:1709`。
|
||||
|
||||
建议处理顺序:**E01 的本库释放判定 → B02 的工程/共享库影响范围 → E02 的明确用户确认路径 → B01/B05/B11 的等待及停止结果 → E03 输入兼容性与剩余条件按钮原生验收**。这些是后续工作建议,未在本次流程整理中实施。
|
||||
@@ -1,73 +0,0 @@
|
||||
# 误判复核与优化顺序
|
||||
|
||||
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
|
||||
|
||||
> 这是当天早期的复核与建议;后续实施结果见 [占用范围验证](2026-11-12-scoped-release-validation.md),不将早期未通过项追记为成功。
|
||||
|
||||
依据 `42d0ceb` 的六处修复记录、真实冻结程序验收,以及 13:44–13:46 的外部进程归属交叉核对。本轮只做分类和优化建议,没有修改业务代码。统计单位是已知问题根因,不能据此估算整个程序的缺陷率。
|
||||
|
||||
## 已修复的六处问题
|
||||
|
||||
| 问题 | 复核分类 | 依据 |
|
||||
| --- | --- | --- |
|
||||
| 导出器退出期间 OpenProcess 返回 5,立即认为释放失败 | 误判/过早得出失败结论 | 原生退出竞争;需要继续观察新快照与目标文件,而不是只看一次权限错误。已修复并有真实导入/更新复测 |
|
||||
| 无工程参数的外部 viewdraw 阻止备份入口 | 跨工程占用误判 | 未证明目标被占用;恢复入口已改为结合路径、地址与目标文件实际探测 |
|
||||
| 历史 sAddress_.adr 不一致导致报告工程内容不同 | 内容校验范围误判 | 地址元数据不等于工程内容;完整复制保留,但主要内容哈希排除 |
|
||||
| 旧工程没有辅助 PCB/pcb.prj 被报告备份不完整 | 工程格式误判 | PCB 唯一关联主 PRJ 的旧格式本身可用;已复用同一身份检查并真实进入副本校验 |
|
||||
| 私有桌面窗口不可读,不能正常取消 PCB | 真实 Windows 接入缺陷 | 正常进程查询权限不等于可读外部桌面 HWND;已修复并真实关闭客户端 |
|
||||
| 释放按钮可点击但 busy 导致处理函数直接返回 | 真实 UI 状态缺陷 | R6 原包实际点击无窗口,R7 新包先禁用再可用,实际打开窗口 |
|
||||
|
||||
六处中四类属于误判/过严判断,两类属于真实功能缺陷。这里“误判”仍然是程序需要修复的缺陷,不表示可以撤销失败记录或补记验收成功。
|
||||
|
||||
## 当前剩余五类问题
|
||||
|
||||
| 类别 | 判定 | 是否仍需修改 |
|
||||
| --- | --- | --- |
|
||||
| 外部未知会话导致整库释放 PARTIAL | **已确认占用范围误判,1 个根因至少影响两道释放门禁** | 是,最高优先级;操作集合全退出判断与底层资源证明必须一起修正 |
|
||||
| 显示释放 4 个,但确认允许操作只有 2 个 | **统计归因错误** | 是;区分本次请求关闭、实际退出、原已退出、外部只读观察,不混成主动释放数量 |
|
||||
| PCB 读写确认挡住校验与备份恢复 | **原生提示真实发生,普通流程缺少相应确认路径;当前停止不等于检测错** | 是;明确用户授权、目标身份和实际占用核查;不能当 ICDB 损坏,也不能直接自动同意 |
|
||||
| A/B 的原生 EDIF 导出崩溃 | **真实导出失败,输入/原生兼容性根因未定** | 是;保留错误码、输入及导出证据,独立复现,不绕过内容身份校验 |
|
||||
| 条件按钮、现场失联副本、Win10 等未完成 | **验收缺口,不能记为已发生漏洞或误判** | 补真实覆盖;测试后再决定需要何种修改 |
|
||||
|
||||
此前“本程序遗留会话导致释放不了”的描述需细化:本程序在停止启动过程中确实留下过两个 PCB 客户端,属于真实清理问题;正常关闭后,继续挡住整库确认的是外部软件。不能用后半段的误判抹去前半段实际残留,也不能把两者当成同一种“锁”。
|
||||
|
||||
## 优化顺序与验收条件
|
||||
|
||||
### P1:统一占用归属和资源范围
|
||||
|
||||
当前备份入口与整库释放入口使用不同的判断强度;一处已经按目标资源探测,另一处仍能因未知进程直接停止。应复用统一的“来源、目标范围、活动阶段、资源证据”判断,避免每个入口再次发明一套锁规则。
|
||||
|
||||
- 来源记录:创建时保存 PID、创建时间、映像、任务号、私有桌面、目标工程/库和父子关系;重启后按身份核对,不能仅凭 PID。
|
||||
- 范围判定:区分同工程、同库共享依赖、明确其他库、未知。由谁拉起与是否占用本库分别保存。
|
||||
- 观察项不自动变成阻止项。明确属于其他库的进程不要求退出;未知项展示不确定原因,继续取本库在途调用、目标文件/数据库、地址、必要原生读取等证据。证据不足不能猜测安全。
|
||||
- 不能只把 `scope is not False` 改成 `scope is True`,也不能只改“所有行退出”条件;否则可能放过真实打开同库的外部会话,或仍被底层第二道门禁挡住。
|
||||
- 目标文件独占打开只是证据之一,不单独保证原生接口、共享依赖和检查期间的状态均安全。后续写入前还需重新核对。
|
||||
|
||||
验收至少包括:其他软件开其他库且持续运行时,本库能正常完成操作;其他软件确实持有本库数据库时,本库拒绝相关写入;外部进程来源不明但目标文件无占用时,不能单凭进程名永久阻止;PID 被复用时不得操作新进程。
|
||||
|
||||
### P1:把单项失败与批次停止分开
|
||||
|
||||
现有一个 `safe_to_continue` 同时承载多种情况:当前项失败、当前工程占用、共享库写入未结束、释放证据不足。因此某个工程的问题容易扩大为整库不可用。
|
||||
|
||||
逐项保留业务结果,再明确能否继续及影响范围:仅当前工程、整个共享库、原生执行通道、用户主动停止。安全释放的失败项继续下一项;仅当前工程问题是否可绕过,需要以共享资源证据决定;共享写入未返回则继续保护。不要全局放开 false 或直接删历史记录。
|
||||
|
||||
验收要使用同一批次“坏工程 → 好工程”以及“共享库真实占用 → 后续写入不得开始”两个方向。现有真实多来源新增已通过前一方向的一种安全失败场景,不代表所有占用场景都通过。
|
||||
|
||||
### P1/P2:接通原生读写提示与非阻塞操作
|
||||
|
||||
普通校验、检查、恢复副本按操作目的决定是否允许读写授权,不复用只适用于修复后的隐式授权。识别精确提示后展示目标和选项,用户可继续、跳过、取消;等待用户决定时保持 UI 可用,并明确后续任务是否仍需等当前原生会话。检查流程不能因用户点击而悄悄变成自动修复。
|
||||
|
||||
队列、原生执行和关闭分别展示等待对象与阶段。取消排队立即生效;已进入原生写入时说明是否正在等待返回或支持原生取消。普通校验/管理当前在批次外层持有队列,评估能否在完整单项事务结束后让出通道,不在 Remove→Add 中间插入另一写任务。
|
||||
|
||||
### P2:结果和性能
|
||||
|
||||
- UI 使用“检测结果、操作结果、释放状态”分别表达,避免将“待用户确认”写成工程损坏,或将“上传成功”写成 READY。
|
||||
- 修正释放数字归因,报告观察项不增加本次主动释放数量。
|
||||
- 来源、版本、依赖等便宜的输入检查先做;只复查本次受影响工程和实际依赖。避免每个按钮都全局扫描并读取无关窗口。
|
||||
- 原生 EDIF 单独诊断;保存失败输入和退出码,让独立 CBB 继续,不能降低身份校验来消除报错。
|
||||
|
||||
### P2:真实并行与异常操作回归
|
||||
|
||||
保留其他软件测试作为并行验收条件,覆盖:外部独立工程持续打开、外部共享同库、检查中排队再取消、停止后立即释放、刷新时连续点击、版本窗口开关、断网、源文件变化、主程序关闭与重启后的 PID 复用。分别核查目标变更、真实进程退出、权威状态和剩余任务,而不是只看按钮恢复可用或 Python 测试通过。
|
||||
|
||||
当前最有价值的改动是修 E01 的作用范围与证据链,而不是继续增加更多全局拒绝条件。最终验收仍要求实际完整校验与恢复到 READY;本次分类没有补齐这一缺口。
|
||||
@@ -1,337 +0,0 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"created": "2026-11-12T11:32:48",
|
||||
"overall_acceptance": "NOT_PASSED",
|
||||
"automatic_icdb_repair": false,
|
||||
"merged": false,
|
||||
"issue_closed": false,
|
||||
"environment": {
|
||||
"windows": [
|
||||
"11",
|
||||
"10.0.26200",
|
||||
"SP0",
|
||||
"Multiprocessor Free"
|
||||
],
|
||||
"python": "3.12.10",
|
||||
"mentor": "EE7.9.5"
|
||||
},
|
||||
"baseline_commit": "b86e4e315a2ac7d8a3d05587389d0237b6576881",
|
||||
"candidate": {
|
||||
"executable": "F:\\CbbAccept-20261112\\candidate-release4\\dist\\CbbRefreshVerify-Background\\CbbRefreshVerify.exe",
|
||||
"module_count": 62,
|
||||
"source_and_frozen_code_equal": true,
|
||||
"source_sha256_checked": true,
|
||||
"packaged_assets_equal": true,
|
||||
"exe_icon_images_equal": true,
|
||||
"executable_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d"
|
||||
},
|
||||
"tests": {
|
||||
"name": "pytest",
|
||||
"errors": "0",
|
||||
"failures": "0",
|
||||
"skipped": "0",
|
||||
"tests": "1851",
|
||||
"time": "382.059",
|
||||
"timestamp": "2026-11-12T11:20:58.800467+08:00",
|
||||
"hostname": "Abs"
|
||||
},
|
||||
"compileall_passed": true,
|
||||
"git_diff_check_passed": true,
|
||||
"original_integrity": {
|
||||
"time": "2026-11-12T11:29:23",
|
||||
"results": [
|
||||
{
|
||||
"scope": "A",
|
||||
"source": "F:\\Sync Tool Skyworth\\Work Maps\\Skyworth_CBB_Lib\\CBB\\1GPHY_RTL8211F",
|
||||
"checked": 187,
|
||||
"changes": []
|
||||
},
|
||||
{
|
||||
"scope": "B",
|
||||
"source": "F:\\Sync Tool Skyworth\\Work Maps\\Skyworth_CBB_Lib\\CBB\\1GPHY_RTL8211F_A",
|
||||
"checked": 185,
|
||||
"changes": []
|
||||
},
|
||||
{
|
||||
"scope": "field-library-originals",
|
||||
"source": "F:\\Sync Tool Skyworth\\Work Maps\\Skyworth_CBB_Lib\\Mentor_lib_EE7.9",
|
||||
"checked": 26887,
|
||||
"changes": []
|
||||
}
|
||||
],
|
||||
"originals_unchanged": true
|
||||
},
|
||||
"native_crud": {
|
||||
"same_name_update": {
|
||||
"operation": "update",
|
||||
"name": "1GPHY_8212",
|
||||
"stage": "complete",
|
||||
"status": "UPLOADED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "上传已确认;本批次未启用自动校验。"
|
||||
},
|
||||
"remove": {
|
||||
"operation": "remove",
|
||||
"name": "1GPHY_8212",
|
||||
"stage": "complete",
|
||||
"status": "REMOVED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "已由原生操作移除,重新读取目录确认不存在;应用未创建备份。"
|
||||
},
|
||||
"batch_first_safe_failure": {
|
||||
"operation": "add",
|
||||
"name": "1GPHY_RTL8211F",
|
||||
"stage": "complete",
|
||||
"status": "UPLOAD_FAILED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "Native identity exporter failed or reported an error."
|
||||
},
|
||||
"batch_next_added": {
|
||||
"operation": "add",
|
||||
"name": "1GPHY_8212",
|
||||
"stage": "complete",
|
||||
"status": "UPLOADED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "上传已确认;本批次未启用自动校验。"
|
||||
}
|
||||
},
|
||||
"final_ui_observations": [
|
||||
{
|
||||
"time": "2026-11-12T11:26:17",
|
||||
"event": "legacy-backup-recovery-result",
|
||||
"bundle_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d",
|
||||
"text": [
|
||||
"目标 CBB",
|
||||
"备份工程",
|
||||
"恢复未通过:备份校验未通过,目标未更改。\nDATABASE_RECOVERY_REQUIRED: 是(&Y) | 否(&N) | If an XDS or ExpeditionPCB is running on this design, it's likely that\nyour file system and/or network system was too slow to determine\nwhich product the design is open in within the 15 second timeout\nperiod.\n\nOtherwise, the design may not have been closed properly due to\nthe XDS or ExpeditionPCB crashing in the last session.\n\nBefore continuing, please confirm that no other users have the\ndesign open.\n\nContinue to open the design with read/write access permission?\n记录:F:\\CbbAccept-20261112\\final-data\\evidence\\backup-restore-90b843115d07\\recovery-result.json"
|
||||
],
|
||||
"target_primary_unchanged": true
|
||||
},
|
||||
{
|
||||
"time": "2026-11-12T11:27:59",
|
||||
"event": "final-backup-queue-cancelled",
|
||||
"bundle_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d",
|
||||
"text": [
|
||||
"目标 CBB",
|
||||
"备份工程",
|
||||
"恢复未通过:已取消排队,未启动原生操作。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"time": "2026-11-12T11:28:27",
|
||||
"event": "summary-release-initial-state",
|
||||
"bundle_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d",
|
||||
"enabled": false,
|
||||
"text": [
|
||||
"ICDB 检查结束:未发现异常 0,发现问题 0,占用 0,无法确认 0,取消 1,未执行 0",
|
||||
"中心库",
|
||||
"可见 1 / 1 · READY 0 · 异常/待确认 1",
|
||||
"ICDB 检查结束:未发现异常 0,发现问题 0,占用 0,无法确认 0,取消 1,未执行 0",
|
||||
"正在执行当前任务…"
|
||||
]
|
||||
},
|
||||
{
|
||||
"time": "2026-11-12T11:28:28",
|
||||
"event": "summary-release-opened",
|
||||
"bundle_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d",
|
||||
"text": [
|
||||
"正在检查当前库关联的会话…",
|
||||
""
|
||||
]
|
||||
},
|
||||
{
|
||||
"time": "2026-11-12T11:28:34",
|
||||
"event": "force-warning-cancel",
|
||||
"bundle_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d",
|
||||
"text": [
|
||||
"仅强制结束以下客户端。客户端中其他已打开工程也会退出;未保存的更改会丢失,正在写入的工程可能需要恢复。\n数据库服务器和归属未知的进程不会被强制结束。\n\n1GPHY_8212 — ExpeditionPCB.exe (PID 21856)\n1GPHY_8212 — ExpeditionPCB.exe (PID 21248)\n\n仍要结束这些进程吗?"
|
||||
]
|
||||
},
|
||||
{
|
||||
"time": "2026-11-12T11:28:59",
|
||||
"event": "r7-normal-exit",
|
||||
"bundle_sha256": "2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d",
|
||||
"exit_code": 0
|
||||
}
|
||||
],
|
||||
"backup_recovery": {
|
||||
"installed": false,
|
||||
"status": "FAIL",
|
||||
"detail": "备份校验未通过,目标未更改。\nDATABASE_RECOVERY_REQUIRED: 是(&Y) | 否(&N) | If an XDS or ExpeditionPCB is running on this design, it's likely that\nyour file system and/or network system was too slow to determine\nwhich product the design is open in within the 15 second timeout\nperiod.\n\nOtherwise, the design may not have been closed properly due to\nthe XDS or ExpeditionPCB crashing in the last session.\n\nBefore continuing, please confirm that no other users have the\ndesign open.\n\nContinue to open the design with read/write access permission?",
|
||||
"target_primary_unchanged": true
|
||||
},
|
||||
"residual": {
|
||||
"library": "F:\\CbbAccept-20261112\\library\\native-add\\fixture\\mentor_lib.lmc",
|
||||
"status": "PARTIAL",
|
||||
"confirmed_scope": [
|
||||
{
|
||||
"name": "ExpeditionPCB.exe",
|
||||
"pid": 21856,
|
||||
"release_status": "RELEASED",
|
||||
"consent_allowed": true
|
||||
},
|
||||
{
|
||||
"name": "ExpeditionPCB.exe",
|
||||
"pid": 21248,
|
||||
"release_status": "RELEASED",
|
||||
"consent_allowed": true
|
||||
}
|
||||
],
|
||||
"final_target_clients": 0,
|
||||
"observed_unconfirmed": [
|
||||
{
|
||||
"name": "viewdraw.exe",
|
||||
"pid": 29832,
|
||||
"scope_confirmed": false
|
||||
},
|
||||
{
|
||||
"name": "cscript.exe",
|
||||
"pid": 8652,
|
||||
"scope_confirmed": false
|
||||
}
|
||||
],
|
||||
"foreign_task_processes_terminated": false,
|
||||
"lock_or_address_files_deleted": false
|
||||
},
|
||||
"remaining": [
|
||||
{
|
||||
"priority": "P1",
|
||||
"problem": "Unconfirmed processes from another task still prevent whole-library release proof"
|
||||
},
|
||||
{
|
||||
"priority": "P2",
|
||||
"problem": "Release count includes unconsented observation rows that exited independently"
|
||||
},
|
||||
{
|
||||
"problem": "Native PCB read/write permission prompt prevents successful verify/READY and backup installation"
|
||||
},
|
||||
{
|
||||
"problem": "Native EDIF exporter crashes for isolated A/B inputs, exit 0xC0000005"
|
||||
},
|
||||
{
|
||||
"problem": "Some conditional native buttons, field lost-session recovery, Windows 10 remain unaccepted"
|
||||
}
|
||||
],
|
||||
"evidence": [
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\candidate-release4\\bundle-verification.json",
|
||||
"bytes": 261,
|
||||
"sha256": "8dbefef3d8cbd65f3531a1919b11a8bea1b494f01fe63a65ac277e05b572b7de"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\candidate-release4\\source-sha256.json",
|
||||
"bytes": 8168,
|
||||
"sha256": "35d9904b515297ab033e3290ae69785fa827e7f3440d1a670e665016c18b28f8"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\full-suite-delivery.xml",
|
||||
"bytes": 265893,
|
||||
"sha256": "cb3298e2aa72c5f4899e1b4dc21c88b35b58af6343de5f3d148e6a5acfcba7de"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\desktop-map-red.xml",
|
||||
"bytes": 11144,
|
||||
"sha256": "e209aa9aadefec21013ffaa1364c42cf210b3bfb738fb7cc817bd9f39f1aaa5f"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\desktop-map-green.xml",
|
||||
"bytes": 4929,
|
||||
"sha256": "1a5b5814bc21d3f739573700f4c93da3b241161124f80ed44d2ee0bcf5f01c39"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\legacy-backup-red.xml",
|
||||
"bytes": 7828,
|
||||
"sha256": "6c05be80efcd1430de99a905b9a32aaa29079aedb7cef606a673896bebf200dc"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\legacy-backup-green.xml",
|
||||
"bytes": 13877,
|
||||
"sha256": "2a0fc3ddb5b743f2cb2db00a81dc1bc025f76a75a5c6099f667e3461a555d49b"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\summary-release-red.xml",
|
||||
"bytes": 3116,
|
||||
"sha256": "3dcec893e4d3dca47d8d48bd8e83752f8a3860da09195c40429d1841bf6b9a6b"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\summary-release-green.xml",
|
||||
"bytes": 10321,
|
||||
"sha256": "f8beefdea1b616d6459f4e12becdbdac633b4650f487332627d5e54c85518ce6"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\originals-rechecked.json",
|
||||
"bytes": 632,
|
||||
"sha256": "693155ed50d18af7d9ae1bda41a696d25687b486541fc0e9df9956e7dbfe7653"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-native-inspection.json",
|
||||
"bytes": 22288,
|
||||
"sha256": "038a635a8bd3e5d5de5eb4ad73125b12bbd1416d53a8f27ebe014e2a6bb84536"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\r7-accept.log",
|
||||
"bytes": 25203,
|
||||
"sha256": "ceca1412c2df483f4290e7131c587af5de16d30874f23a588f53d32db432f9e7"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-data\\management\\management-741e463dc75d4f35acd992ad42200fbf\\checkpoint.json",
|
||||
"bytes": 3547,
|
||||
"sha256": "7fe68525e01d8e35bacb2bc84cdc4fa1469bb599f40bd6a77dcad7a6725bce24"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-data\\management\\management-d83e404f22864885ab57943783897ebe\\checkpoint.json",
|
||||
"bytes": 11411,
|
||||
"sha256": "6928ef7a8d9664da7ee209afeb280c61fd081f5d207ef8686ebf09ad57d8140a"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-data\\management\\management-a900d2b62a544623b499ce55d099dfd2\\checkpoint.json",
|
||||
"bytes": 1140,
|
||||
"sha256": "dc0725ff0db339f81be5af021925396cba50f303cfea5c0aa2370a8deff18486"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-data\\management\\management-c8a18e3bb8bc4aa19f7dbc982b3602d2\\checkpoint.json",
|
||||
"bytes": 11652,
|
||||
"sha256": "d09ad8d7b88e7ba607ddb34cac523ef8074f5d3f43fe2f033c35125629bc251c"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-data\\evidence\\backup-restore-90b843115d07\\recovery-result.json",
|
||||
"bytes": 3901,
|
||||
"sha256": "df44ea3f2d01ace1189c2c5f93af8c67abc6c196cf2ba8e99318d222a582c58a"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\final-data\\release-checks\\sessions-346da47efa8d\\result.json",
|
||||
"bytes": 8947,
|
||||
"sha256": "743fc764021ac8fc22d6f799f4f9663d704d0fd6c41aafd14409666e85747900"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\step-restore_execute.py.log",
|
||||
"bytes": 4134,
|
||||
"sha256": "a6da200bd6a3895d60ae85eac419b440696a5b9b5503856990782ed04f1f9795"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\r5-batch-add-result.png",
|
||||
"bytes": 75306,
|
||||
"sha256": "a812edf98f2a96ce4c1f5cd218c9ec0b045e94538af11dbd65c35db799e03e2d"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\r5-release-result-1.png",
|
||||
"bytes": 44151,
|
||||
"sha256": "a916a2080504201902c5d873fc3d7913e47804b7c5e1aa410a8ef8f778e759b5"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\r7-summary-release-initial-state.png",
|
||||
"bytes": 11891,
|
||||
"sha256": "d13236159a38adf8030d84a66f59db4269cba471f305e835918cf1e4f86b7397"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\r7-summary-release-opened.png",
|
||||
"bytes": 87863,
|
||||
"sha256": "a77e0169e7dce2f25f5f3343afa73af75418837987bb7561c24dca18485e3627"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbAccept-20261112\\r7-final-release-result.png",
|
||||
"bytes": 88350,
|
||||
"sha256": "1b504c4b0c42c18cdbc73bc58b5aa716cde43cb0330106b07fc7cb5e40c7a514"
|
||||
}
|
||||
]
|
||||
}
|
||||
@@ -1,74 +0,0 @@
|
||||
# 2026-11-12 冻结程序与 Mentor 原生验收
|
||||
|
||||
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
|
||||
|
||||
**结论:未通过整体验收,不合并发布、不关闭工单。**
|
||||
|
||||
本轮实际运行冻结 EXE、Mentor EE7.9.5、原生 COM/命令和私有桌面窗口;点击使用真实 UIA/Win32 控件,没有替换业务服务、伪造原生结果或抢占前台鼠标。此前 48 按钮 Qt 模拟结果不计为本次原生验收。
|
||||
|
||||
最终候选包:`F:\CbbAccept-20261112\candidate-release4\dist\CbbRefreshVerify-Background\CbbRefreshVerify.exe`。
|
||||
SHA-256:`2ad132e434a8e1de0b61f271aa87215749b0f3174ea0682eb578bc31271e8a4d`。
|
||||
冻结档案中的 62 个模块逐一与源代码编译结果相符;打包资产及 EXE 图标与当前源图标相符。
|
||||
原始记录、截图、失败尝试和各轮候选包保存在 `F:\CbbAccept-20261112`,便于核对本报告中的具体测试轮次。
|
||||
|
||||
## 隔离范围与原件核对
|
||||
|
||||
- 原生创建独立空库 `library\native-add\fixture\mentor_lib.lmc`,随后实际新增、更新和移除测试 CBB。
|
||||
- 另复制现场库的共享依赖及四个工程到 `field-lib`:26,887 个文件,815,607,385 字节。该库实际读取到四个 READY 项。
|
||||
- 独立来源 A/B 的库引用原指向不可用的 S 盘,仅对隔离副本改为测试库;原工程未改。
|
||||
- 验收结束重新核对原件:A 的 187 个主要文件、B 的 185 个主要文件、复制现场库所对应的 26,887 个原文件,大小及 SHA-256 均未改变。见 `originals-rechecked.json`。
|
||||
- 完整旧 Work 已人工保留到 `manual-old-work`;应用管理操作继续采用手动备份提示,没有新增自动整库备份。
|
||||
- 原生进程只使用正常关闭/取消。强制结束的确认窗口实际打开后选择了取消;没有强制结束其他工具的进程,也没有删除地址或锁文件。
|
||||
|
||||
## 实际发现并修改的六处问题
|
||||
|
||||
| 问题 | 修改 | 实际复测及边界 |
|
||||
| --- | --- | --- |
|
||||
| 导出器退出期间 OpenProcess 返回 5,立即被当成释放失败 | 5/87 均继续观测;只有新快照无目标、已取得句柄退出且数据库探测通过才放行 | R3 同名更新、R5 新增及同批失败续跑;真实活动进程和数据库占用仍拒绝放行 |
|
||||
| 另一个工程无 PRJ 参数的 viewdraw 阻止备份入口 | 备份空闲检查结合目标路径、地址及实际独占读探测,不再单凭未知命令阻止 | R7 中其他 DxDesigner 仍运行,备份进入隔离库及原生校验;这不等于下面的整库释放问题已解决 |
|
||||
| 原生导入不保留历史 `sAddress_.adr`,被误报内容不一致 | 将其与 `sAddress.adr` 一起排除在主要内容哈希之外,规则版本升为 2,完整复制仍保留 | R3 更新 `UPLOADED`,原理图 ASCII/CSV/EDIF、布局与注册内容一致;R5 再新增成功 |
|
||||
| 外部私有桌面的 GetThreadDesktop 返回拒绝访问,重新 OpenDesktop 后 HWND 还不可读 | 对失败 PID 枚举当前窗口站的桌面;打开桌面后先枚举窗口,再核对 PID 并发送关闭/取消 | R5 原先残留的 PCB 启动器/客户端两个真实进程正常退出,获得 RELEASE_CONFIRMED;R6/R7 同类客户端也退出 |
|
||||
| 恢复入口强制要求旧格式工程没有的辅助 `PCB/pcb.prj` | 复用既有工程身份检查;PCB 必须唯一关联所选主 PRJ,数据库与布局仍必需 | R5 原包拒绝;R7 新包进入隔离复制和真实 PCB 校验。原生读写确认仍导致校验失败,目标主要文件未改,未安装备份 |
|
||||
| ICDB 结果窗口在前台任务忙时仍允许点击释放,处理函数却直接返回 | 结果按钮跟随执行状态;目标库因保留会话而排队时使用排队释放入口 | R6 实际点击无窗口;R7 同样操作时按钮先禁用,随后恢复,点击成功打开释放窗口。排队入口另有回归覆盖 |
|
||||
|
||||
## 实际按钮与流程结果
|
||||
|
||||
| 入口/动作 | 观察结果 | 验收判断 |
|
||||
| --- | --- | --- |
|
||||
| 选择库、读取、三个菜单、搜索/筛选、选择可见项/清空选择 | 空库、一个 PENDING、四个 READY 的真实数据可读取和操作;READY 不进入维护入口 | 已覆盖这些真实数据场景;381/3,000 项响应测试仍仅是此前模拟 |
|
||||
| 高级设置及原生 Verify 开关 | 展开、收起、切换和还原成功 | 仅验证控件;Win10 原生 Verify 运行未验收 |
|
||||
| 查看运行日志、打开日志目录 | 实际点击可用 | 已覆盖 |
|
||||
| 已选校验、可见非 READY 校验 | 前者实际运行;后者确认后取消,没有执行写入 | 已选校验未通过,不能报告 READY |
|
||||
| 检查中提交普通校验 | UI 可用、确认成功、显示排队;检查结束后实际启动普通 PCB 校验 | 排队行为通过;校验本身失败 |
|
||||
| ICDB 批量检查(取消确认/完整执行/停止/再次使用) | 完整检查约 38 秒;读写确认不含 ICDB 错误,归类为无法确认;停止后可重新使用,可能留下客户端供确认释放 | 未执行自动 Repair;不能视为现场修复通过 |
|
||||
| 版本历史与备份 | 从应用打开真实原生窗口,读取五个备份;创建 User 备份,再从原生 Restore 对话框恢复所选备份 | 原生输出 `Backup restored successfully.`;关闭后 CLOSED、safe=true,应用按钮恢复。证据为 R3 原生工具操作 |
|
||||
| 从备份恢复(无效来源、取消确认、重复点击) | 无效输入拒绝;取消不启动;执行后按钮禁用,重复点击未重复启动 | 已覆盖 |
|
||||
| 恢复排队、取消排队 | R6/R7 在检查期间提交,显示排队;取消后明确未启动原生操作 | 已覆盖 |
|
||||
| 旧格式备份完整恢复 | R7 通过格式/复制检查,在隔离库打开 PCB 时被读写确认拦下 | **未完成恢复**;installed=false、目标主要文件不变,保留证据 |
|
||||
| 用工程替换已选 CBB | R3 实际 Remove → 原生缺项复读 → Add → 内容比对 → 目录复读 | UPLOADED、safe=true;关闭自动校验,不等于 READY |
|
||||
| 移除 | R5 原生 CleanWGLib 返回成功;独立目录读取为空,应用读取 0 项 | REMOVED、safe=true |
|
||||
| 多来源新增 | 同批 A 的 EDIF 导出失败、safe=true;随后 C 实际新增成功;独立复读只有 C | 未因首项安全失败而停止整批 |
|
||||
| 重复名称新增 | 实际拒绝;独立复读的条目、工程身份不变 | 已覆盖 |
|
||||
| 管理执行确认取消、再次确认、连续点击执行 | 取消后可重新确认;运行时禁用执行,重复点击不创建第二项 | 新增、更新、移除均有真实操作记录 |
|
||||
| 查看原生提示、重新检查、确认释放、关闭 | 窗口和提示可读;本工具两个 PCB 进程正常退出 | R5 完整释放通过;R6/R7 仍被下面的跨任务观察项阻止整库确认 |
|
||||
| 强制结束客户端 | 确认名单只列两个本库 PCB,点击取消后继续正常释放 | 仅确认/取消路径通过,实际强制终止未执行 |
|
||||
| 主程序退出 | R3/R4/R5/R6/R7 正常退出,末次退出码 0 | 不将退出应用造成的内存释放算作整库释放功能通过 |
|
||||
|
||||
**仍未实际触发的条件按钮**:处理 PCB 未保存更改的保存/放弃选择、活动原生备份的“请求原生取消”、管理批次“当前项结束后停止”、实际强制终止、ICDB 特征错误后的工程副本重导入、成功安装备份后的再次打开并 READY。它们的 Qt/回归测试不能替代原生验收;不宣称每一个按钮的所有原生分支都已通过。
|
||||
|
||||
## 未解决的验收卡点
|
||||
|
||||
1. **P1:未确认归属的其他任务仍能阻止整库释放。** R7 `sessions-346da47efa8d/result.json` 中,确认允许的 PCB PID 21856/21248 均 RELEASED,但另一个私有桌面上的 viewdraw PID 29832 为 scope_confirmed=false、consent_allowed=false、WAITING,整体仍 PARTIAL。末次检查还观察到其他工具的 cscript;没有本库确认所属的客户端残留。原因在于 `residual_sessions._release_residual_sessions` 要求全部观察项 RELEASED,随后 `library_lock._prove_library_released` 也把无法确定路径的进程当成候选占用。不能要求关闭其他任务来通过本库验收。后续需要将观察项与可操作目标分开,并用本库数据库/地址/独占句柄及在途调用证明决定能否继续;同时覆盖真实持有本库数据库时仍必须拒绝的场景。本轮未修改此判定。
|
||||
2. **P2:释放数量混入自然退出的观察项。** R7 显示“已释放 4 个会话,确认允许 2 项”;另两个未允许项在操作期间自行退出,不能让用户误以为工具主动关闭了四项。
|
||||
3. **原生 PCB 读写确认尚未走通。** `DATABASE_RECOVERY_REQUIRED` / `DATABASE_SAFETY_STOP` 的正文要求确认没有其他用户后以读写权限继续,未直接提供 ICDB 损坏证据。检查、普通校验和备份副本校验均未获得 READY;不能自动同意写入后宣称通过。
|
||||
4. **输入兼容性:A/B 的原生 EDIF 导出崩溃。** 退出码 3221225477(0xC0000005),本机 WER 指向 MSVCR90.dll;相同环境下 C 的三种导出均成功。A/B 继续报告上传失败,不跳过身份校验伪造成功。
|
||||
5. 现场服务器会话失联的一致故障副本完整入口、Windows 10、自动修复仍未验收。ICDB 自动 Repair 保持关闭。
|
||||
|
||||
## 复核依据
|
||||
|
||||
- 最终源代码:1,851 项 Python 测试通过,1 条 pywinauto COM 警告;`full-suite-delivery.xml`。编译检查及 `git diff --check` 通过。
|
||||
- 回归保留修复前失败与修复后通过记录:`export-race-*`、`pathless-red.xml`、`address-manifest-*`、`desktop-map-*`、`legacy-backup-*`、`summary-release-*`。
|
||||
- R3 同名更新:`final-data/management/management-741e463dc75d4f35acd992ad42200fbf/checkpoint.json`。
|
||||
- R5 移除:`management-d83e404f22864885ab57943783897ebe`;同批失败:`management-a900d2b62a544623b499ce55d099dfd2`;同批继续新增:`management-c8a18e3bb8bc4aa19f7dbc982b3602d2`。
|
||||
- R7 恢复:`final-data/evidence/backup-restore-90b843115d07/recovery-result.json`。R7 释放按钮状态、原生提示、取消强制结束、最终释放及退出见 `r7-accept.log` 和对应截图。
|
||||
- 机器可读索引和指定证据摘要哈希见同目录 `2026-11-12-native-acceptance-validation.json`。大体积原始工程和运行时控制记录保留在本机,不纳入提交。
|
||||
@@ -1,41 +0,0 @@
|
||||
# 阻塞进程来源核查
|
||||
|
||||
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
|
||||
|
||||
> 本文保留当时的只读归属结论;后续代码修改及试验见 [占用范围验证](2026-11-12-scoped-release-validation.md)。
|
||||
|
||||
2026-11-12 13:44–13:46 进行了只读核查。结论:此前阻止整库释放的两个未知会话来自 `dxdesigner-part-replacement` 测试,不是本 CBB 程序拉起;其他软件并行测试暴露了本程序的归属和释放判定漏洞。本次没有修改业务代码或关闭进程。
|
||||
|
||||
| 历史进程 | 归属证据 | 结论 |
|
||||
| --- | --- | --- |
|
||||
| viewdraw.exe,PID 29832,父进程 5940 | 外部工具 lifecycle.jsonl 记录 worker_started PID 5940;其 private-desktop.json 记录 cad_pid 29832、创建时间 2026-11-12 03:17:21.099 UTC、桌面 dx-f2b2947f8ab144e19760e4599fda3249,均与 CBB 残留快照一致;窗口工程位于外部工具 outputs 目录 | 外部工具创建的 DxDesigner |
|
||||
| cscript.exe,PID 8652,父进程 5940 | 命令行运行外部工具 QuickPartReplace.vbs;对应任务 project-checkpoint.json 的工程和 cad_pid 29832 与窗口匹配 | 同一外部测试批次的脚本 |
|
||||
| ExpeditionPCB.exe,PID 21856 / 21248 | 命令行明确为 CBB 隔离库 1GPHY_8212 的 PCB;父子链 30552 → 21856 → 21248;CBB 验收释放记录确认两项均 RELEASED | 本程序的客户端,已正常退出 |
|
||||
|
||||
外部工程 CentralLibrary 指向 `F:/Sync Tool Skyworth/Work Maps/Skyworth_CBB_Lib/Mentor_lib_EE7.9/mentor_lib.lmc`。CBB 验收目标为 `F:/CbbAccept-20261112/library/native-add/fixture/mentor_lib.lmc`,二者不同。
|
||||
|
||||
13:44 的实时快照中,历史 PID 29832、8652 均已不存在,没有把新进程当成旧残留。当前另有真实父子链:DxPartReplace.exe 29436 → DxPartReplace.exe 16540 → cscript.exe 21364;父进程创建时间均早于子进程,映像和脚本均位于外部工具目录。此快照仅代表当时状态,PID 不能作为长期身份。
|
||||
|
||||
13:46 对本次隔离库的 LMC、icdb.dat、LayoutDB.lyt 共 12 个实际文件同时执行 GENERIC_READ、共享模式 0、OPEN_EXISTING 的只读独占打开,全部成功并关闭句柄;库内未发现 sAddress.adr。这证明当时这些目标文件没有阻止独占读的占用,不能倒推 11:28 的全部句柄状态。
|
||||
|
||||
## 逻辑漏洞所在
|
||||
|
||||
1. `library_lock._owner_matches_scope` 主要读取命令行中的 PRJ/PCB/LMC/数据库引用。裸 viewdraw.exe 和外部 QuickPartReplace.vbs 命令没有这些路径,均返回 None(UNKNOWN)。它没有在这里利用父进程批次记录、私有桌面或窗口工程身份进一步归属。
|
||||
2. `residual_sessions.inspect_residual_sessions` 的 `scope is not False` 将这两项 UNKNOWN 加入当前库残留观察列表;`scope_confirmed=false` 正确阻止关闭它们。
|
||||
3. `_release_residual_sessions` 又要求列表中全部行均为 RELEASED。这使“不能确认归属、不能操作的观察项”成为“当前库必须退出的对象”,结果一直 PARTIAL。
|
||||
4. 即使绕过上一层,`library_lock._prove_library_released` 仍将范围为 UNKNOWN 的候选进程加入 owners,可能在目标文件独占打开之前直接拒绝证明。
|
||||
|
||||
以历史真实命令行回放当前归属函数,两项均得到 UNKNOWN,和真实残留列表一致。不是用户并行测试不合规,而是程序把“未知来源”升级成了“目标库占用”。
|
||||
|
||||
修复需要分别保存**进程来源**和**资源范围**:本程序创建的进程未必仍占目标;其他软件创建的进程也可能实际打开同一个库。因此不能只按进程名、父 PID 或软件目录粗暴排除外部进程,最终应结合创建时间绑定的身份、实际工程/库引用、本库在途调用、目标资源与地址探测决定是否阻止。外部归属只读展示,不自动结束;真实共享目标占用仍需保护。
|
||||
|
||||
## 证据
|
||||
|
||||
- 本机完整核查:`F:\CbbAccept-20261112\process-origin-audit.json`。
|
||||
- 身份交叉核对、外部证据 SHA-256、分类回放及只读资源探测:`F:\CbbAccept-20261112\process-origin-confirmed.json`。
|
||||
- 外部工具自身记录根目录:`F:\Sync Tool Skyworth\Work Maps\dxdesigner-part-replacement\outputs\frozen-random-final-20261112-r4`。
|
||||
- 父 worker 记录:`data/batch-resources/28182d59cb9d4e0087fa312baf11d804/lifecycle.jsonl` 第 2 行。
|
||||
- 原生进程创建身份:该批次 `generation-1/private-desktop.json`。
|
||||
- 对应工程:`data/tasks/4f49b13e-3603-4578-b7f2-c9fe88bca864/quick-run/project-checkpoint.json`。
|
||||
|
||||
这里只完成核查和归因,没有声称跨软件阻塞已修复。
|
||||
@@ -1,19 +0,0 @@
|
||||
# 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。
|
||||
@@ -1,63 +0,0 @@
|
||||
{
|
||||
"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,61 +0,0 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"time": "2026-11-12T16:00:50.172809+08:00",
|
||||
"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": "85ec649c18fefcf50d8b4caf0a66005f108713e7d5f170d1aecc82e3c5fcfe33"
|
||||
},
|
||||
"tests": {
|
||||
"passed": 1880,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"xml": "F:\\CbbAccept-20261112\\full-scoped-final10.xml"
|
||||
},
|
||||
"recovery": {
|
||||
"path": "F:\\CbbAccept-20261112\\scoped10-data\\evidence\\backup-restore-5f9b134ab83c\\recovery-result.json",
|
||||
"installed": true,
|
||||
"source_status": "PASS",
|
||||
"target_status": "PASS",
|
||||
"library_flag": "GREEN",
|
||||
"safe_to_continue": true,
|
||||
"retained_work": "F:\\CbbAccept-20261112\\field-lib-recovery\\ReusableBlocksLP\\1GPHY_8212\\Work.before-restore-5f9b134ab83c"
|
||||
},
|
||||
"release": {
|
||||
"path": "F:\\CbbAccept-20261112\\scoped10-data\\release-checks\\sessions-fc23a2a2024f\\result.json",
|
||||
"status": "RELEASE_CONFIRMED"
|
||||
},
|
||||
"original_integrity": {
|
||||
"time": "2026-11-12T16:00:19",
|
||||
"results": [
|
||||
{
|
||||
"scope": "A",
|
||||
"source": "F:\\Sync Tool Skyworth\\Work Maps\\Skyworth_CBB_Lib\\CBB\\1GPHY_RTL8211F",
|
||||
"checked": 187,
|
||||
"changes": []
|
||||
},
|
||||
{
|
||||
"scope": "B",
|
||||
"source": "F:\\Sync Tool Skyworth\\Work Maps\\Skyworth_CBB_Lib\\CBB\\1GPHY_RTL8211F_A",
|
||||
"checked": 185,
|
||||
"changes": []
|
||||
},
|
||||
{
|
||||
"scope": "field-library-originals",
|
||||
"source": "F:\\Sync Tool Skyworth\\Work Maps\\Skyworth_CBB_Lib\\Mentor_lib_EE7.9",
|
||||
"checked": 26887,
|
||||
"changes": []
|
||||
}
|
||||
],
|
||||
"originals_unchanged": true
|
||||
},
|
||||
"interaction_log": "F:\\CbbAccept-20261112\\scoped10-accept.log",
|
||||
"known_limits": [
|
||||
"Native shared-symbol server sometimes cannot remove its own address file after STOP; not bypassed.",
|
||||
"Actual field server-session-loss recovery and Windows 10 acceptance remain unverified.",
|
||||
"Automatic ICDB Repair remains disabled. No merge, release or issue closure."
|
||||
]
|
||||
}
|
||||
@@ -1,54 +0,0 @@
|
||||
# 占用范围、单项队列及原生确认验证
|
||||
|
||||
> 证据路径说明:本文的本机绝对路径、日志名、截图、测试 XML 和冻结包指向验收机器上的原始材料,未纳入 Git;仓库仅保留说明和验证摘要。
|
||||
|
||||
本次基于 `42d0ceb`,沿用 `codex/runtime-lifecycle-safety`。当天较早的进程归属、误判分析和完整流程图是修改前快照;本记录描述后续实现及验收,不追溯改写先前失败。
|
||||
|
||||
## 修改
|
||||
|
||||
- 未确认归属的外部客户端只作观察,不要求其退出、不发送关闭,也不增加主动释放数量。释放仍检查本库在途调用、目标数据库地址和实际独占只读文件句柄;自身请求身份缺失、共享写入未返回时继续保护。
|
||||
- 旧 NATIVE_CALL/CLOSING/UNCONFIRMED 日志结合进程创建身份核实;已退出或 PID 被复用不会仅因日志阶段被认定仍在写入,读取失败保留未确认。
|
||||
- 单项失败后只对绑定任务取得新的释放证明;证明成功才允许后续项,原业务失败和原证据保留。校验和管理在完整单项事务结束后让出原生队列,不在移除与重新导入之间穿插其他任务。排队取消保留已完成项和汇总。
|
||||
- 普通校验、上传后的校验、备份副本/目标校验接通精确 PCB 读写提示和历史版本选择。用户可以继续、跳过、取消;绑定本任务 PCB 的创建身份、启动链、工程和私有桌面,临近点击重新检查。ICDB 诊断检查不借此执行 Repair 或隐式取得写入授权。
|
||||
- 实测新增修复:同名更新自动校验不再把自己当前的事务当成历史未释放事务。仅允许同线程、同 lease、同 PID、同目标及无待处理导出/检查点的嵌套调用。取消批次后不再把刷新排进已经取消的队列而丢失结果。
|
||||
- 第二轮真实试验暴露导出器进程链误判:CSV 导出器 PID 16068 创建于 14:56:19,却收录了 12:57:45 已创建的 OneDrive 服务 PID 23804。运行时追踪改为排除原有进程、绑定原生进程句柄创建时间、拒绝早于父进程的子进程及 PID 复用后的新进程链。旧记录复核也排除出生时间证明不可能属于导出任务的条目;仍需原生范围及分析副本数据库的全套释放证明,未发送退出请求给 OneDrive。
|
||||
- 失败释放复核包含在单项原生队列内部,完成后才让出通道,避免下一项开始时前一项又来争取管理互斥。新增两项回归先失败后通过,相关 46 项通过。
|
||||
- 普通读写确认比较真实控件的句柄、ID、类和正文,允许 UIA 后续增加已识别的标题栏辅助节点、重排控件及省略按钮快捷键标记;替换真实按钮仍拒绝。实际快照显示 Win32 的“是(&Y)”变成 UIA 的“是(Y)”,进程及窗口/按钮句柄均未变化;不能据此认定工程或窗口被替换。来自恢复副本真实失败的回归先失败后通过,相关 52 项通过。
|
||||
|
||||
## 冻结包和真实试验
|
||||
|
||||
当前候选程序:`F:\CbbAccept-20261112\candidate-scoped10\dist\CbbRefreshVerify-Background\CbbRefreshVerify.exe`。
|
||||
|
||||
SHA-256:`85ec649c18fefcf50d8b4caf0a66005f108713e7d5f170d1aecc82e3c5fcfe33`。64 个冻结模块逐个与当前源码编译结果一致,资源及 PE 图标一致;检查记录 `candidate-scoped10/bundle-verification.json`。较早的 scoped5 为 `4cf682130923c4534d3193a8b967ffc83d0cc519e580f6739a4861daed4f36c3`,scoped7 为 `e37b2601bb3851e9170ab8d552800547004b1a5b9882211f1180693dde76957c`,scoped9 为 `a59488dcbad72bdd7159772aabdb33b6411dea972babec33e64412a3406f810f`;各次动作日志绑定实际运行包哈希,不能混为同一版本。
|
||||
|
||||
原生写操作仅在 `F:\CbbAccept-20261112` 隔离库及工具生成的 `C:\Users\ABS_Windows\.cbb-restore` 校验副本中进行,环境为 Windows 11 build 26200、Mentor EE7.9.5 及私有桌面。操作驱动使用真实程序按钮和后台窗口消息,没有前台鼠标抢占、强杀原生客户端或手删地址文件。
|
||||
|
||||
| 试验 | 事实与证据 |
|
||||
| --- | --- |
|
||||
| 外部脚本持续存在,目标真实句柄被占用 | `scoped3-accept.log`:持有 LMC 的 Windows 独占句柄时拒绝释放,错误 32;外部脚本仍存活 |
|
||||
| 目标句柄关闭,外部脚本继续运行 | 同一日志:RELEASE_CONFIRMED,主动释放 0、授权 0;外部行为保持 OBSERVED,脚本最后自行退出 |
|
||||
| 同名更新并自动校验 | `management-38fdf8365d834a13ba7dca67111861ff/checkpoint.json`:UPLOADED_VERIFIED、safe=true;真实选择继续打开和最后手动保存版本;校验 InSynch、Save/IsSaved/Close、PCB EXITED,IsVerifiedReuseBlock=1/READY。校验约 91.6 秒 |
|
||||
| 重复更新发现地址残留 | `management-0cee6b12e93b45918caf18101c603dc5/checkpoint.json`:RECOVERY_REQUIRED;原生移除已发生,重新导入未开始,不能记为成功 |
|
||||
| 地址残留的原生证据 | 共享符号库服务器 PID 17344 日志记录 Database closed、defragmentation completed、Could not remove server address file、S: STOP;之后没有该服务器进程。`address-native-probe/result.json`:原生目录可复读,地址仍在、端点不可达;未将不可达视作无占用证明 |
|
||||
| 早期空白库试验 | 读写和手动版本选择成功,但原生 PartPkg 报缺 PartsDB 分区;不作为校验成功 |
|
||||
| 早期自动校验试验 | `management-cb85cb2b564d4778912df7accf85c109` 上传完成,校验被自身事务锁拒绝;已补回归后由上述真实完整成功试验复核 |
|
||||
| 导出器错误收录 OneDrive | `scoped6-data/management/management-498258fe1e1541e9a135ca4117cb7344/source-identity/csv-process.json`:CSV 日志已完成、分析副本无地址,但历史父 PID 关联扩大至外部进程;后来进程查询超时,本次无原生移除/新增,不计上传成功。`scoped6-active-handle-attribution.json` 为只读 Windows 句柄归属诊断;新增失败回归 `export-lineage-red.xml`、`export-history-red.xml`,修复后两组 73 项通过 |
|
||||
| 旧误判记录解除及更新重试 | scoped7 真实点击释放:RELEASE_CONFIRMED、主动关闭 0;保留旧证据。随后 `scoped7-data/management/management-d4017aaae47041b08dae6445858a7419/checkpoint.json` 完成原生更新及工程身份复读,UPLOADED、safe=true,关闭了本批次自动校验 |
|
||||
| 恢复确认窗口误判 | scoped7 的 `evidence/backup-restore-f52ee9adc188/recovery-result.json` 和 scoped9 的 `evidence/backup-restore-22512e81160b/recovery-result.json` 都在副本阶段失败,installed=false。先处理控件辅助节点后,第二次实际差分又明确了快捷键标记差异;未将两次失败记为通过 |
|
||||
| 快捷键表示差异的原生定位 | `open-identity-real-diff.json` 捕获同一 PID/创建时间、HWND、真实按钮句柄下的 Win32/UIA 差异。修正后 `identity-debug/verify-f34d9f72d4aa/result.json` 实际 PASS、GREEN/READY=1、Save COMMITTED、Close CLOSED、PCB EXITED、资源 RELEASED。这是定位与复测,不能替代完整恢复按钮验收 |
|
||||
| 立即停止后的残留 | scoped7 的 `evidence/icdb-check-73cdeda6d163/pcb-open/verify-bb3bdc393b0b/result.json`:CANCELLED、safe=false;本任务启动器 12408、PCB 344 在扫描时尚无可关闭窗口。未以队列取消成功冒充原生退出成功 |
|
||||
| 残留后的再次释放 | 后续读取发现原生 Tip of the Day;在精确绑定的私有桌面正常关闭此帮助窗口后,PCB 完成打开。scoped9 实际“确认释放”正常关闭 3 项并 RELEASE_CONFIRMED,应用正常退出。`cleanup-scoped7-stop*/startup-close.json` 保留早期未确认记录;未强杀进程、未把帮助窗口关闭本身记成数据库释放 |
|
||||
|
||||
| 最终包验收 | 事实与证据 |
|
||||
| --- | --- |
|
||||
| 最终包完整恢复按钮 | scoped10 真实执行空来源校验、取消确认、重新确认、运行期间重复点击,随后完成副本校验、目标变更检查、保留旧 Work、安装、目标再次原生校验。`scoped10-data/evidence/backup-restore-5f9b134ab83c/recovery-result.json`:installed=true,source_validation 和 result 都为 PASS、GREEN/READY=1、safe=true,Save COMMITTED、Close CLOSED、PCB/助手 EXITED、资源 RELEASED |
|
||||
| 最终状态及退出 | scoped10 原生状态刷新后可见 READY 1;READY 项检查及恢复入口禁用。最终释放为 RELEASE_CONFIRMED,主动关闭 0/允许 0,主程序正常退出 0;未修改旧失败记录 |
|
||||
| 原始文件复核 | 16:00:19 对 A/B 来源及原始中心库共 27,259 个文件重新检查大小、SHA-256,无变化;`originals-rechecked.json`。先前失败校验副本归档到 F 盘以保留证据并腾出系统盘空间,映射见 `archived-validation-copies/map.json` |
|
||||
|
||||
最终源码全量测试 **1,880 passed**(1 条既有 pywinauto STA 警告),记录 `F:\CbbAccept-20261112\full-scoped-final10.xml`;compileall、diff-check 通过。冻结代码和图标一致性、完整恢复、释放及原始文件复核的机器摘要见同目录 [验证 JSON](2026-11-12-scoped-release-validation.json)。历史版本是按此前选择偏好使用最后手动保存版本,READY 不表示已经人工核对版本内容或无数据回退。
|
||||
|
||||
## 保留限制
|
||||
|
||||
自动 ICDB Repair 继续关闭。现场服务器会话失联的一致故障副本、Windows 10、跨机共享库掉线尚未验收;不会自动合并、发布或关闭工单。共享符号数据库地址若原生工具自身无法删除,不能通过本程序删除文件或仅凭无进程放行。此前 A/B 输入 EDIF 导出崩溃与空白依赖库有关与否仍需独立复现,不绕过工程身份校验。
|
||||
|
||||
立即停止时的晚到窗口仍需要正常处理:本次 Tip of the Day 是在精确绑定的私有桌面关闭后才由应用完成会话释放,不能将此试验写成自动退出无缺口。未知/损坏检查点、尚未返回的真实共享写入继续保留未确认状态。
|
||||
@@ -1,319 +0,0 @@
|
||||
{
|
||||
"created": "2026-11-13T15:28:15.015734+08:00",
|
||||
"base_main": "cbc57238496bc84f4228aa44929208a9516dff1b",
|
||||
"branch": "codex/import-without-export-gate",
|
||||
"full_suite": {
|
||||
"tests": 1895,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0
|
||||
},
|
||||
"first_wrong_source_suite": {
|
||||
"tests": 1893,
|
||||
"failures": 15,
|
||||
"errors": 0,
|
||||
"skipped": 0
|
||||
},
|
||||
"first_wrong_source_reason": "Subprocesses used the editable original checkout; corrected by explicit PYTHONPATH to this worktree.",
|
||||
"frozen": {
|
||||
"module_count": 64,
|
||||
"source_and_frozen_code_equal": true,
|
||||
"source_sha256_checked": true,
|
||||
"packaged_assets_equal": true,
|
||||
"exe_icon_images_equal": true,
|
||||
"executable_sha256": "98a642d8e81f42b708934bb4dc2d023c49c2acdae5851151a430f101c74c9615"
|
||||
},
|
||||
"native": [
|
||||
{
|
||||
"name": "1GPHY_RTL8211F_A",
|
||||
"status": "UPLOADED_VERIFY_FAILED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。其他工程文件有差异,已记录供核对。\nProject Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase",
|
||||
"checkpoint": "F:\\CbbI1113\\d3\\management\\management-9a5e12feb292441e8c5709270ffef18b\\checkpoint.json",
|
||||
"native_add_success": true,
|
||||
"registration_matches": true,
|
||||
"top_level_block_mapping": {
|
||||
"source": "1GPHY_RTL8211F",
|
||||
"registered": "1GPHY_RTL8211F_A",
|
||||
"allowed": [
|
||||
"1GPHY_RTL8211F",
|
||||
"1GPHY_RTL8211F_A"
|
||||
]
|
||||
},
|
||||
"assets_match": false,
|
||||
"asset_differences": {
|
||||
"added": [
|
||||
"PCB/1GPHY_RTL8211F_A.pcb",
|
||||
"database/cdbback/2026-11-13 15.12.50-49956.zip"
|
||||
],
|
||||
"deleted": [
|
||||
"PCB/1GPHY_RTL8211F.pcb"
|
||||
],
|
||||
"modified": [
|
||||
"1GPHY_RTL8211F_A.prj"
|
||||
]
|
||||
},
|
||||
"verification": [
|
||||
{
|
||||
"stage": "verified",
|
||||
"time": "2026-11-13T07:18:34.641758+00:00",
|
||||
"verification": {
|
||||
"status": "FAIL",
|
||||
"stderr": "Project Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase",
|
||||
"stdout": "",
|
||||
"evidence_path": "F:\\CbbI1113\\d3\\management\\management-9a5e12feb292441e8c5709270ffef18b\\verify\\verify-43d609b6535d\\result.json",
|
||||
"safe_to_continue": true,
|
||||
"library_flag": "UNKNOWN",
|
||||
"library_flag_detail": "",
|
||||
"report_path": null,
|
||||
"content_check_exit_code": null,
|
||||
"error_category": "MENTOR_PROJECT_INTEGRATION",
|
||||
"error_stage": "forward_annotation",
|
||||
"bridge_attempts": [],
|
||||
"timings_seconds": {
|
||||
"preflight": 0.031,
|
||||
"worker_setup": 6.328,
|
||||
"pcb_startup": 100.469,
|
||||
"failure_diagnostics": 1.25,
|
||||
"integration": 24.953,
|
||||
"forward_annotation": 24.812,
|
||||
"total": 133.406
|
||||
},
|
||||
"incomplete_timing_phases": [
|
||||
"integration",
|
||||
"forward_annotation"
|
||||
],
|
||||
"recovery_attempts": [],
|
||||
"release_proof": null,
|
||||
"write_outcome": {
|
||||
"save_state": "UNKNOWN",
|
||||
"close_state": "UNKNOWN",
|
||||
"helper_state": "EXITED",
|
||||
"resource_state": "RELEASED",
|
||||
"interrupted": false,
|
||||
"detail": "保存返回结果无法确认"
|
||||
},
|
||||
"session_record_path": "F:\\CbbI1113\\d3\\management\\management-9a5e12feb292441e8c5709270ffef18b\\verify\\verify-43d609b6535d\\session.json"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "1GPHY_RTL8211F",
|
||||
"status": "UPLOADED_VERIFY_FAILED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。其他工程文件有差异,已记录供核对。\nProject Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase",
|
||||
"checkpoint": "F:\\CbbI1113\\d3\\management\\management-6be18dcb186846e78b3220b59631249e\\checkpoint.json",
|
||||
"native_add_success": true,
|
||||
"registration_matches": true,
|
||||
"top_level_block_mapping": {
|
||||
"source": "1GPHY_RTL8211F",
|
||||
"registered": "1GPHY_RTL8211F",
|
||||
"allowed": [
|
||||
"1GPHY_RTL8211F",
|
||||
"1GPHY_RTL8211F"
|
||||
]
|
||||
},
|
||||
"assets_match": false,
|
||||
"asset_differences": {
|
||||
"added": [],
|
||||
"deleted": [
|
||||
"database/cdbsvr/events/events - Abs 的冲突副本 1 - 2026-09-16 07-16-58.dat",
|
||||
"database/cdbsvr/events/events - Abs 的冲突副本 1 - 2026-09-16 07-16-58.idx"
|
||||
],
|
||||
"modified": [
|
||||
"1GPHY_RTL8211F.prj"
|
||||
]
|
||||
},
|
||||
"verification": [
|
||||
{
|
||||
"stage": "verified",
|
||||
"time": "2026-11-13T07:23:45.773452+00:00",
|
||||
"verification": {
|
||||
"status": "FAIL",
|
||||
"stderr": "Project Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase",
|
||||
"stdout": "",
|
||||
"evidence_path": "F:\\CbbI1113\\d3\\management\\management-6be18dcb186846e78b3220b59631249e\\verify\\verify-53e1561b73fa\\result.json",
|
||||
"safe_to_continue": true,
|
||||
"library_flag": "UNKNOWN",
|
||||
"library_flag_detail": "",
|
||||
"report_path": null,
|
||||
"content_check_exit_code": null,
|
||||
"error_category": "MENTOR_PROJECT_INTEGRATION",
|
||||
"error_stage": "forward_annotation",
|
||||
"bridge_attempts": [],
|
||||
"timings_seconds": {
|
||||
"preflight": 0.047,
|
||||
"worker_setup": 3.766,
|
||||
"pcb_startup": 80.469,
|
||||
"failure_diagnostics": 1.39,
|
||||
"integration": 22.359,
|
||||
"forward_annotation": 22.297,
|
||||
"total": 106.844
|
||||
},
|
||||
"incomplete_timing_phases": [
|
||||
"integration",
|
||||
"forward_annotation"
|
||||
],
|
||||
"recovery_attempts": [],
|
||||
"release_proof": null,
|
||||
"write_outcome": {
|
||||
"save_state": "UNKNOWN",
|
||||
"close_state": "UNKNOWN",
|
||||
"helper_state": "EXITED",
|
||||
"resource_state": "RELEASED",
|
||||
"interrupted": false,
|
||||
"detail": "保存返回结果无法确认"
|
||||
},
|
||||
"session_record_path": "F:\\CbbI1113\\d3\\management\\management-6be18dcb186846e78b3220b59631249e\\verify\\verify-53e1561b73fa\\session.json"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"duplicate_conflict": {
|
||||
"passed": true,
|
||||
"records": [
|
||||
{
|
||||
"operation": "add",
|
||||
"library": "F:\\CbbI1113\\library3\\native-add\\fixture\\mentor_lib.lmc",
|
||||
"name": "1GPHY_RTL8211F",
|
||||
"partition": "Logical-Physical",
|
||||
"source": "F:\\CbbI1113\\A\\1GPHY_RTL8211F.prj",
|
||||
"auto_verify": false,
|
||||
"stage": "complete",
|
||||
"status": "UPLOAD_FAILED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "同名 CBB 已存在;新增禁止覆盖,请使用明确的同名更新。",
|
||||
"evidence_path": "F:\\CbbI1113\\d4\\management\\management-f43f218e0dcb41e8bfe09d5f2f69a0a8\\checkpoint.json",
|
||||
"release_proof": null,
|
||||
"change_report": null,
|
||||
"history": [
|
||||
{
|
||||
"stage": "release_check",
|
||||
"time": "2026-11-13T07:25:51.703695+00:00"
|
||||
},
|
||||
{
|
||||
"stage": "catalog_before",
|
||||
"time": "2026-11-13T07:26:22.388154+00:00"
|
||||
}
|
||||
],
|
||||
"backup_policy": "manual"
|
||||
}
|
||||
],
|
||||
"target_and_shared_content_unchanged": true,
|
||||
"catalog": {
|
||||
"library": "F:\\CbbI1113\\library3\\native-add\\fixture\\mentor_lib.lmc",
|
||||
"flow": 1,
|
||||
"entries": [
|
||||
{
|
||||
"name": "1GPHY_RTL8211F",
|
||||
"partition": "Logical-Physical",
|
||||
"engineering_identity": {
|
||||
"top_level_block": "1GPHY_RTL8211F",
|
||||
"schematic_sha256": "ed969340d9e89875b30c7c0ab175e82a92f965743f798cca297ad8de24a55f94",
|
||||
"layout_sha256": "61c2107047afd2ce8778028bdc5527cb1e2ca14b13190625a2c9c5397077b4f8"
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "1GPHY_RTL8211F_A",
|
||||
"partition": "Logical-Physical",
|
||||
"engineering_identity": {
|
||||
"top_level_block": "1GPHY_RTL8211F_A",
|
||||
"schematic_sha256": "400183e788a0980f8e08a140e1eb7f96b845c48cf486e51c90cdb33900688e41",
|
||||
"layout_sha256": "3b78437a66f3d9a510b7aed6130928629b1b15fa86a8029e1786006e900fb5d5"
|
||||
}
|
||||
}
|
||||
],
|
||||
"safe_to_continue": true
|
||||
}
|
||||
},
|
||||
"source_hashes": {
|
||||
"src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057",
|
||||
"src/cbb_refresh_verify/backup_recovery.py": "f07741fdeed73871eda1d4e72803bb516cc877b5b49973e3f7aa18972228baa2",
|
||||
"src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a",
|
||||
"src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35",
|
||||
"src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9",
|
||||
"src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3",
|
||||
"src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92",
|
||||
"src/cbb_refresh_verify/diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072",
|
||||
"src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b",
|
||||
"src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56",
|
||||
"src/cbb_refresh_verify/dialog_probe.py": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e",
|
||||
"src/cbb_refresh_verify/dialog_rules.py": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5",
|
||||
"src/cbb_refresh_verify/dialog_supervisor.py": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247",
|
||||
"src/cbb_refresh_verify/failed_session.py": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09",
|
||||
"src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98",
|
||||
"src/cbb_refresh_verify/icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03",
|
||||
"src/cbb_refresh_verify/icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360",
|
||||
"src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed",
|
||||
"src/cbb_refresh_verify/library_lock.py": "6836ec8ac21e788eb75326ff44cb31ad4bdfb5f381bd35cdf33e6b34c7fca89e",
|
||||
"src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195",
|
||||
"src/cbb_refresh_verify/library_reader.py": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438",
|
||||
"src/cbb_refresh_verify/maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990",
|
||||
"src/cbb_refresh_verify/management.py": "773f9405c39b3fdcea4647da84ca97e9113e03db386a45bfabd468a98ed1fb36",
|
||||
"src/cbb_refresh_verify/management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0",
|
||||
"src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638",
|
||||
"src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116",
|
||||
"src/cbb_refresh_verify/models.py": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105",
|
||||
"src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94",
|
||||
"src/cbb_refresh_verify/native_backup.py": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d",
|
||||
"src/cbb_refresh_verify/native_engineering_identity.py": "e704e8f56c43629a1593d490776af328bb032208ee2f5ffd1d1be6c3114f5412",
|
||||
"src/cbb_refresh_verify/native_export_guard.py": "c3eeadd557d2f89bfce855c0736c953043ebe97bc81aa74e40bd370780a54741",
|
||||
"src/cbb_refresh_verify/native_management.py": "5eca3b40ef57ecd4a12a0d0c26afd1bb1afb448a0b7c5452bfe80591a3a74b77",
|
||||
"src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49",
|
||||
"src/cbb_refresh_verify/native_repair.py": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98",
|
||||
"src/cbb_refresh_verify/native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393",
|
||||
"src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f",
|
||||
"src/cbb_refresh_verify/operation_lifecycle.py": "3838c5a501711d16f578c45ebbc6f960872b0c3ba6bbda9a597f994ef746cef6",
|
||||
"src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f",
|
||||
"src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903",
|
||||
"src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5",
|
||||
"src/cbb_refresh_verify/pcb_open_consent.py": "7ad9c3a183f565b8b1f7a57b7c29ee9cbc3a79fe1ac0d778459edbdcb25b5664",
|
||||
"src/cbb_refresh_verify/pcb_restore_prompt.py": "39e0b8623a838911eff61066f3e9c8ede4364dbf73efc5a8994197ec72a96488",
|
||||
"src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4",
|
||||
"src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63",
|
||||
"src/cbb_refresh_verify/reimport_recovery.py": "66b2ba8f8c2ec9ae8c386d6b1aa74a1fbb6bfb509c4df0a262f8d7a0ca48469e",
|
||||
"src/cbb_refresh_verify/residual_sessions.py": "4ac500b33b209611d54eb496c6c30727ba159742d625431ceea84471a5fc3442",
|
||||
"src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e",
|
||||
"src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367",
|
||||
"src/cbb_refresh_verify/scoped_manifest.py": "9318bf0f929d23c18466a25d83a4a9903822093c123aae10510061788c6d0ab7",
|
||||
"src/cbb_refresh_verify/session_record.py": "2bc3cff365008864584138a4ff13538bb6b2f90d981e7d008a1300f9102c6e7e",
|
||||
"src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196",
|
||||
"src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8",
|
||||
"src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2",
|
||||
"src/cbb_refresh_verify/verify_runner.py": "3027ef7fc1ef6365ff36ae0c83389d869b92ffcd96985d10275bca4dc9483e3f",
|
||||
"src/cbb_refresh_verify/__init__.py": "dd960394d88657820dba858792abf0de258e05efceb08ae2f0b39c6ad78bc469",
|
||||
"src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0",
|
||||
"src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599",
|
||||
"src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "65081eb8d9791f8ec1316023a80edb07a91b2658b9ed27cb4cf21addb0f26026",
|
||||
"src/cbb_refresh_verify/ui/icdb_check_task.py": "ade3bf414aa29b42f4c1535c613b2cacb2735f6abc7900e6da25999390a5891d",
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "af65fcd8e41f35f412e8c23f525821c92b2cfb78b9d0fd4f88c515249dbd24e1",
|
||||
"src/cbb_refresh_verify/ui/management_dialog.py": "4ae522e8509d9153af9d41d349f1611c80f73c0913f01f33cc5a122665cf56bf",
|
||||
"src/cbb_refresh_verify/ui/pcb_open_dialog.py": "3cabdc15f1b2abaeb919a7f29f32d4b053186701fd514646d9bdd3ea32f364f6",
|
||||
"src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da",
|
||||
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "1d2a26bfc7ee21b11d7edbc3074b4c525e8c9fb628bca45b08bd06fc672586c8",
|
||||
"src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888",
|
||||
"src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
|
||||
},
|
||||
"local_evidence_sha256": {
|
||||
"F:\\CbbI1113\\full-suite.xml": "df15b248bb4eb21580800d43ce60a5ac4f4bae5a4d3c67580f45f0752472fcab",
|
||||
"F:\\CbbI1113\\full-suite-final3.xml": "d0702c2a69dab5aef57c4fa7e7f9d633058b3c03dae5970665c393c979476ab6",
|
||||
"F:\\CbbI1113\\accept.log": "39620df9b61514eed6b1c48edb19d6e1abbb71c1e4c7e7d31f0a7e1968442220",
|
||||
"F:\\CbbI1113\\accept2.log": "b3d1509d1c6d65973ba4da666103785402aef576c1fe78936c559caaaa02a62d",
|
||||
"F:\\CbbI1113\\accept2-resume.log": "6c5fb656f12c4e790ca1b3f01593283161bff7f8b253fd4e1444c53f0fb49d91",
|
||||
"F:\\CbbI1113\\accept3.log": "0a69d374c5ae3652aac7e871578a45f090220cd3d04e8701390d95abd020a8d9",
|
||||
"F:\\CbbI1113\\auto-verify-trial.json": "8729b9c6f4a48199f2e2515c59bae1891ce61b00a5572a9721dd25e003e196a0",
|
||||
"F:\\CbbI1113\\accept4.log": "81af1d0a6146b33220dd85996ab7d4b28eee820fa6d8fb30314effea249cd568",
|
||||
"F:\\CbbI1113\\duplicate-conflict-trial.json": "b7051b3e01102e51c551dde8aade9d358454a97ff91fb547702c8a4dbeb5928e",
|
||||
"F:\\CbbI1113\\native-add-wait-chain.json": "f671192272d5edcd9ed3ea736b42ea7d330c86adaadc1a5cc434b6c55fb270c1"
|
||||
},
|
||||
"independent_review": "No actionable findings; static review only; three updates reviewed.",
|
||||
"cloud_beta2_updated": false,
|
||||
"schematic_semantic_equivalence_checked": false,
|
||||
"known_limits": [
|
||||
"Automatic ICDB Repair disabled; field lost-session recovery unverified.",
|
||||
"Windows 10 and cross-machine SMB unverified.",
|
||||
"Long native Add waits observed; root cause not determined; not claimed fixed."
|
||||
]
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
# 2026-11-13:CBB 导入与附加核验解耦
|
||||
|
||||
分支:`codex/import-without-export-gate`;基线 main:`cbc57238496bc84f4228aa44929208a9516dff1b`。
|
||||
原始工程、运行日志、截图、测试 XML 和冻结包保留在本机 `F:\CbbI1113`;仓库只保存说明和验证摘要。
|
||||
|
||||
## 原因与修改
|
||||
|
||||
此前导入会在原生 Add 之前和之后强制执行 ASCII、CSV、EDIF 内容导出;能力探测也依赖这些导出器。因此 EDIF 导出崩溃能让本来尚未执行 Add 的工程显示“上传失败”,取消上传后自动校验也不能避开它。
|
||||
|
||||
- 新增、同名替换和隔离管理适配器均不再调用或要求安装这些导出器。独立导出诊断代码保留,EDIF 崩溃根因没有被宣称解决。
|
||||
- 保留完整来源暂存及复制核验、事务随机标识、检查点、库基线、精确进程和租约验证、原生成功回执以及重新读库。只在暂存副本中重定位库引用,来源旧库地址失效不会拒绝向明确选择的新库导入。
|
||||
- 上传完成必须确认目标库、名称、分区、工程关联、顶层块和 Layout。顶层块允许保持来源名或被原生导入改成本次注册名;真实映射与实际目标身份保留在证据中,不能接受第三个名称。
|
||||
- PRJ 路径规范化、默认标记、历史/其他工程文件的差异单独保存 `assets_match` 和增删改清单,并提示核对;不再以全文件相等判定上传失败。Layout 不一致、关联错误或结构缺失仍拒绝确认。
|
||||
- 不比较原生重写后的 ICDB 原始字节,也不再声称证明了原理图语义等价。`identity_proof` 保存实际复读结果,没有伪造为来源内容。
|
||||
- 上传后 Verify 保持独立可选;只有 PASS、权威 GREEN/READY 和释放确认才能记录 `UPLOADED_VERIFIED`。否则区分 `UPLOADED` 与 `UPLOADED_VERIFY_FAILED`。
|
||||
- 来源或名称错误按行进入结果,其他有效条目继续。界面仍拒绝同批重复目标,避免对同一目标提交含糊的多次变更。单项失败先复核释放,只有未释放的相关库暂停后续写入;不绕过真实数据库占用。
|
||||
|
||||
## 回归与代码复核
|
||||
|
||||
新增用例先复现:导出器缺失导致能力禁用、导入调用附加导出、单行无效来源挡住批次、旧库地址失效、原生 PRJ 改写以及原生顶层块改名误报失败。保留陌生顶层块和 Layout 差异的拒绝用例,以及上传后 Verify 失败时安全继续下一项的用例。
|
||||
|
||||
最终源码全量回归 **1,895 passed**,1 条既有 pywinauto STA COM 警告;编译检查通过。冻结包的 64 个应用模块、资产和 EXE 图标与源码一致。独立只读代码复核没有发现待修正项;该复核没有执行原生操作。
|
||||
|
||||
第一轮全量运行有 15 项失败:子进程使用了机器 editable 安装的原始工作目录,而不是本隔离工作区。该轮不计为通过;显式设置 `PYTHONPATH` 到本工作区 `src` 后,全套通过。后续测试与原生试验均固定此路径,未更改用户 Python 安装。
|
||||
|
||||
## 实机中保留的失败
|
||||
|
||||
- 第一轮冻结包在全新隔离库实际成功新增 A/B,但 PRJ 自动规范化及历史事件冲突副本缺失被旧的全资产相等规则误报为 `RECOVERY_REQUIRED`。已增加差异证据及回归;该轮不算整体验收通过。
|
||||
- 第二轮实际选择文件后移走一个测试文件、取消确认后重试并连点执行:失效行显示失败,A 随后 `UPLOADED`,B 的原生 Add 也成功。B 被后续“目标顶层块必须等于来源”检查误报为需恢复;已按本次原生命名变换修订。两项都确认释放,主程序最后正常退出 0。该轮同样不算全部通过。
|
||||
- 原生 Add 曾长时间等待。窗口、进程与等待链证据保留;没有确定底层原因,不宣称已修复耗时,也不强制结束原生写入来得到成功结果。
|
||||
|
||||
## 最新冻结包的实际批量链路
|
||||
|
||||
候选程序:`F:\CbbI1113\candidate3\dist\CbbRefreshVerify-Background\CbbRefreshVerify.exe`。
|
||||
SHA-256:`98a642d8e81f42b708934bb4dc2d023c49c2acdae5851151a430f101c74c9615`。
|
||||
|
||||
第三轮从应用真实按钮和文件选择器向全新空隔离库依次导入 B、A,开启上传后自动校验;没有替换原生适配器,没有前台鼠标接管,也没有强制结束进程或删除原生地址/锁文件。
|
||||
|
||||
| 步骤 | 实际结果 |
|
||||
| --- | --- |
|
||||
| B 的原生 Add 与复读 | 原生明确成功,库/名称/分区及工程关联确认;Layout 一致;顶层块从 `1GPHY_RTL8211F` 变为本次注册名 `1GPHY_RTL8211F_A`,映射保留,上传确认通过。 |
|
||||
| B 的上传后 Verify | `MENTOR_PROJECT_INTEGRATION / forward_annotation`,原文 `There are no PartsDB partitions from which to extract parts`。空库没有 PartsDB,不能创建本地 PDB;记录 `UPLOADED_VERIFY_FAILED`、safe=true,不记为上传失败或 READY。 |
|
||||
| B 失败后的同批 A | 实际继续执行 A 的原生 Add,注册及 Layout 复读通过;没有因为 B 的 Verify 失败停掉整批。 |
|
||||
| A 的上传后 Verify | 同样因空库缺 PartsDB 返回 `UPLOADED_VERIFY_FAILED`、safe=true。没有把失败伪造成 READY。 |
|
||||
| 独立目录读取 | 重新启动原生 Library Manager,确认两个正确名称均存在。 |
|
||||
| 来源与退出 | 两份输入主要内容清单未变;原生会话释放,应用正常退出 0;整条试验控制器退出 0。 |
|
||||
| 附加导出 | 本批未生成 ASCII/CSV/EDIF 导出进程记录;对应自动化回归也禁止普通导入调用这些导出边界。 |
|
||||
|
||||
第三轮原始证据:`accept3.log`、`auto-verify-trial.json`、`d3/management/*/checkpoint.json`、各项 `add/identity-comparison.json` 及 `verify/*/result.json`。此试验验证真实上传和“校验失败后释放并继续”的负向场景;**不是多个新增项在依赖完整的中心库中全部达到 READY 的验收**。
|
||||
|
||||
第四轮从同一最新冻结包重新打开该库,实际再次新增已有的 A:取消后重新确认、执行中连点均未重复提交;原生目录确认同名后返回 `UPLOAD_FAILED`、safe=true,检查点没有 `native_add` 阶段。目标及共享主要工程内容清单前后完全一致;独立原生目录仍只有 A/B,程序正常退出 0。证据为 `accept4.log`、`duplicate-conflict-trial.json` 和 `d4/management/*/checkpoint.json`。
|
||||
|
||||
机器可读摘要见同目录 `2026-11-13-import-decoupling-validation.json`。最初两轮发现问题的包及失败记录没有覆盖或改为成功。
|
||||
|
||||
## 范围
|
||||
|
||||
未更新云端既有 `v0.2.4-beta.2`,未合并 main 或关闭工单。自动 ICDB Repair 保持禁用。现场失联故障、Windows 10、跨机器共享库及任意工程内容的完整语义等价仍不在已验证结论中。
|
||||
@@ -1,430 +0,0 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"created": "2026-11-13T17:31:37.910526+08:00",
|
||||
"review": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-414",
|
||||
"base_commit": "1572e2d8cab905c28f96f562851db00ef7ea8ad6",
|
||||
"environment": {
|
||||
"windows": [
|
||||
"11",
|
||||
"10.0.26200",
|
||||
"SP0",
|
||||
"Multiprocessor Free"
|
||||
],
|
||||
"python": "3.12.10",
|
||||
"mentor": "EE7.9.5"
|
||||
},
|
||||
"commands": [
|
||||
"python -X utf8 F:/CbbReview414/run_tests.py tests --junitxml=F:/CbbReview414/full-final.xml",
|
||||
"python -X utf8 F:/CbbReview414/run_tests.py tests/test_review414_write_admission.py --junitxml=F:/CbbReview414/admission-extra.xml",
|
||||
"python -X utf8 -m compileall -q src tests",
|
||||
"git diff --check",
|
||||
"python -X utf8 F:/CbbReview414/build.py",
|
||||
"python -X utf8 F:/CbbReview414/verify_bundle.py",
|
||||
"python -X utf8 F:/CbbReview414/create_library.py",
|
||||
"python -X utf8 F:/CbbReview414/driver7.py"
|
||||
],
|
||||
"full_suite": {
|
||||
"path": "F:\\CbbReview414\\full-final.xml",
|
||||
"sha256": "075f7b76002b451a72af65d64428c0b6c65e5fa5c8776036a5fff55584a6dc54",
|
||||
"tests": 1912,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 520.549
|
||||
},
|
||||
"additional_admission_suite": {
|
||||
"path": "F:\\CbbReview414\\admission-extra.xml",
|
||||
"sha256": "6aa78606fc7aa4af1b3e2f8865752a60a518d9d25b5f88924f2b1d88280b2ac0",
|
||||
"tests": 14,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 5.299
|
||||
},
|
||||
"focused_serial_suite": {
|
||||
"path": "F:\\CbbReview414\\focused-serial-final.xml",
|
||||
"sha256": "8f68dc1ffd22d41f343299ff4382157c5fcb7ce68dc5198d2755a87dc1764337",
|
||||
"tests": 19,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 5.036
|
||||
},
|
||||
"concurrent_test_failure": {
|
||||
"result": {
|
||||
"path": "F:\\CbbReview414\\focused-final.xml",
|
||||
"sha256": "6246c57aee87142dae183aa48399ff2e3f8e8afbff0c4f6f3655d02b93b535fa",
|
||||
"tests": 19,
|
||||
"failures": 4,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 7.213
|
||||
},
|
||||
"reason": "Coordinator ran mutex-using tests during live native acceptance; four management/recovery tests were rejected by Local\\CbbRefreshVerify795. Rerun serially after native trial."
|
||||
},
|
||||
"count_note": "Full suite collected 1912 before two additional tests were appended. Additional 14-test run includes both new tests and 12 already in full suite; 1914 distinct tests passed.",
|
||||
"compileall_passed": true,
|
||||
"diff_check_passed": true,
|
||||
"bundle": {
|
||||
"module_count": 66,
|
||||
"source_and_frozen_code_equal": true,
|
||||
"source_sha256_checked": true,
|
||||
"packaged_assets_equal": true,
|
||||
"exe_icon_images_equal": true,
|
||||
"executable_sha256": "818decc5f0778a27affe3b047da526595007608e234b89c05d3e1c375e1c4cf8"
|
||||
},
|
||||
"red_reproductions": [
|
||||
{
|
||||
"path": "F:\\CbbReview414\\open-red.xml",
|
||||
"sha256": "b33502766075ece9777ceee3f6e7dde66dfb558eff08a5f860ccc0ebd63f9500"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\queue-red.xml",
|
||||
"sha256": "a5bbad8641c7851a5fa3a4bdd15b17784c9c90c92ee4f8c8fc7e51b62ae25f40"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\write-red.xml",
|
||||
"sha256": "4d0b0c6ebb0382955470ecb6072126b1d4f0708e6f77c49060c5be6b592220d7"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\query-batch-red.xml",
|
||||
"sha256": "6299777fd6d3c87849b0b7069afb0d238d4f4f20f84d7cdea59b81f4a479694f"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\export-red.xml",
|
||||
"sha256": "16724c8a015b5cb1c2d304abe6f5678716a4b4d40fd29880cb6f8a2ade451462"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\restore-consent-red.xml",
|
||||
"sha256": "e9e2edad0c3481bea26c00c14253c9fa9b2e2bbcb3679583e52489ac3072f571"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\default-cancel-red.xml",
|
||||
"sha256": "2e4b9b64d9a7fe8c719b08db407b78e6c866a647040761c1be36d566b86dca36"
|
||||
}
|
||||
],
|
||||
"native_trial": {
|
||||
"records": [
|
||||
{
|
||||
"operation": "add",
|
||||
"name": "1GPHY_RTL8211F_A",
|
||||
"status": "CANCELLED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "已取消本批次,未提交后续写入。",
|
||||
"evidence_path": "F:\\CbbReview414\\d7\\management\\management-00175f4d987f48da80bb7821017e7617\\checkpoint.json"
|
||||
},
|
||||
{
|
||||
"operation": "add",
|
||||
"name": "1GPHY_RTL8211F_A",
|
||||
"status": "SKIPPED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "用户跳过本项,未确认未知程序与目标库无关。",
|
||||
"evidence_path": "F:\\CbbReview414\\d7\\management\\management-26da6781691c47c7a8172b5947db7191\\checkpoint.json"
|
||||
},
|
||||
{
|
||||
"operation": "add",
|
||||
"name": "1GPHY_RTL8211F",
|
||||
"status": "UPLOADED",
|
||||
"safe_to_continue": true,
|
||||
"detail": "上传已确认;本批次未启用自动校验。\n原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。其他工程文件有差异,已记录供核对。",
|
||||
"evidence_path": "F:\\CbbReview414\\d7\\management\\management-2a587eeb2919405d9b570df82ff75a2a\\checkpoint.json"
|
||||
}
|
||||
],
|
||||
"choices": [
|
||||
"cancel",
|
||||
"skip",
|
||||
"continue"
|
||||
],
|
||||
"catalog": {
|
||||
"library": "F:\\CbbReview414\\library\\native-add\\fixture\\mentor_lib.lmc",
|
||||
"flow": 1,
|
||||
"safe_to_continue": true,
|
||||
"names": [
|
||||
"1GPHY_RTL8211F"
|
||||
]
|
||||
},
|
||||
"sources_unchanged": true,
|
||||
"parked_untouched_until_explicit_user_close": true,
|
||||
"user_closed_owned_empty_client_before_continue": true,
|
||||
"evidence": {
|
||||
"path": "F:\\CbbReview414\\native-trial.json",
|
||||
"sha256": "ecb21df8fd56755dd3bdc6374fa82b5623c523c396314a1c049c225fc82559df"
|
||||
}
|
||||
},
|
||||
"native_action_log": {
|
||||
"path": "F:\\CbbReview414\\actions7.jsonl",
|
||||
"sha256": "4ee465d2750b826de428693f89fe0cd9d19f67e5ad08c0fb11451184a883faf2"
|
||||
},
|
||||
"superseded_drivers": {
|
||||
"reason": "UIA traversal of disabled parent during modal prompt stalled the driver. Native windows were cancelled normally; no forced native termination.",
|
||||
"logs": [
|
||||
{
|
||||
"path": "F:\\CbbReview414\\accept4.log",
|
||||
"sha256": "f551539adec4e38072a58eff9e1a8c7589d926f2f120342a101f8476450b4b12"
|
||||
},
|
||||
{
|
||||
"path": "F:\\CbbReview414\\accept5.log",
|
||||
"sha256": "d2db6fa91df459d367900832a10c15459ba1ea8fb2a3773c29593c875597a03e"
|
||||
}
|
||||
]
|
||||
},
|
||||
"rejected_native_trial": {
|
||||
"log": {
|
||||
"path": "F:\\CbbReview414\\accept6.log",
|
||||
"sha256": "73cf87c9328d2e4104077f36ecfbdc383ef67d5d5e54674f640d88d8e5a9de16"
|
||||
},
|
||||
"statuses": [
|
||||
"CANCELLED",
|
||||
"SKIPPED",
|
||||
"UPLOAD_FAILED"
|
||||
],
|
||||
"reason": "Existing native _catalog_com refuses any preexisting LibraryManager even after write consent.",
|
||||
"no_force_termination": true,
|
||||
"foreign_client_untouched": true
|
||||
},
|
||||
"interaction_method": "Private desktop Win32 keyboard messages for modal owner decisions; UIA for idle dialogs only. Skip/Continue key routing separately verified against actual Qt dialog.",
|
||||
"history_provenance": [
|
||||
{
|
||||
"tests": 1775,
|
||||
"record_commit": "fdd07224aac99bee8d1f29e8e82d6a2c49964c87",
|
||||
"record": "2026-11-09-full-review-followup-validation.json",
|
||||
"manifest": null,
|
||||
"recorded_manifest_checked_files": 27,
|
||||
"manifest_mismatches": [],
|
||||
"exact_historical_tree_available": false,
|
||||
"collection_exit": 0,
|
||||
"collection_summary": "1775 tests collected in 12.12s"
|
||||
},
|
||||
{
|
||||
"tests": 1851,
|
||||
"record_commit": "42d0cebc54191681b53dcecb120f53236c1963bb",
|
||||
"record": "2026-11-12-native-acceptance-validation.json",
|
||||
"manifest": "F:/CbbAccept-20261112/candidate-release4/source-sha256.json",
|
||||
"recorded_manifest_checked_files": 70,
|
||||
"manifest_mismatches": [],
|
||||
"exact_historical_tree_available": false,
|
||||
"collection_exit": 0,
|
||||
"collection_summary": "1851 tests collected in 11.38s"
|
||||
},
|
||||
{
|
||||
"tests": 1880,
|
||||
"record_commit": "466f400514acc8531a219db8e75641be35304a3f",
|
||||
"record": "2026-11-12-scoped-release-validation.json",
|
||||
"manifest": "F:/CbbAccept-20261112/candidate-scoped10/source-sha256.json",
|
||||
"recorded_manifest_checked_files": 72,
|
||||
"manifest_mismatches": [],
|
||||
"exact_historical_tree_available": false,
|
||||
"collection_exit": 0,
|
||||
"collection_summary": "1880 tests collected in 13.05s"
|
||||
}
|
||||
],
|
||||
"independent_review": "Both findings fixed; final static review reported no additional actionable findings.",
|
||||
"tested_files_sha256": {
|
||||
"src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057",
|
||||
"src/cbb_refresh_verify/backup_recovery.py": "08ca467304f8ce34185212a92de0ebd0b83455302fe9351d09874b180222b523",
|
||||
"src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a",
|
||||
"src/cbb_refresh_verify/close_failed_block.vbs": "e5f0d9678e07a239e96e634b90cdc761de52fc136311fae31484fa38d6fd9781",
|
||||
"src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35",
|
||||
"src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9",
|
||||
"src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3",
|
||||
"src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92",
|
||||
"src/cbb_refresh_verify/diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072",
|
||||
"src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b",
|
||||
"src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56",
|
||||
"src/cbb_refresh_verify/dialog_probe.py": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e",
|
||||
"src/cbb_refresh_verify/dialog_rules.py": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5",
|
||||
"src/cbb_refresh_verify/dialog_supervisor.py": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247",
|
||||
"src/cbb_refresh_verify/failed_session.py": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09",
|
||||
"src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98",
|
||||
"src/cbb_refresh_verify/icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03",
|
||||
"src/cbb_refresh_verify/icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360",
|
||||
"src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed",
|
||||
"src/cbb_refresh_verify/library_lock.py": "6836ec8ac21e788eb75326ff44cb31ad4bdfb5f381bd35cdf33e6b34c7fca89e",
|
||||
"src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195",
|
||||
"src/cbb_refresh_verify/library_reader.py": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438",
|
||||
"src/cbb_refresh_verify/maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990",
|
||||
"src/cbb_refresh_verify/management.py": "7ead9bfffeb44201e44f73d9f039590f091e9a456982f2110dca8ec3695f8803",
|
||||
"src/cbb_refresh_verify/management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0",
|
||||
"src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638",
|
||||
"src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116",
|
||||
"src/cbb_refresh_verify/models.py": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105",
|
||||
"src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94",
|
||||
"src/cbb_refresh_verify/native_backup.py": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d",
|
||||
"src/cbb_refresh_verify/native_engineering_identity.py": "e704e8f56c43629a1593d490776af328bb032208ee2f5ffd1d1be6c3114f5412",
|
||||
"src/cbb_refresh_verify/native_export_guard.py": "523cdf44db8e1665634feadba963ccf26777dc8942fb2eb604d2c30bbe92cbb6",
|
||||
"src/cbb_refresh_verify/native_management.py": "1e8a298aac8c63aef68b1e799d1f06e43de7abdc165be5086e7089a61e643e88",
|
||||
"src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49",
|
||||
"src/cbb_refresh_verify/native_repair.py": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98",
|
||||
"src/cbb_refresh_verify/native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393",
|
||||
"src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f",
|
||||
"src/cbb_refresh_verify/operation_lifecycle.py": "3838c5a501711d16f578c45ebbc6f960872b0c3ba6bbda9a597f994ef746cef6",
|
||||
"src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f",
|
||||
"src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903",
|
||||
"src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5",
|
||||
"src/cbb_refresh_verify/pcb_open_consent.py": "2680930acc4daa314529c435337915333c05a8594ec28bc053c930054602590f",
|
||||
"src/cbb_refresh_verify/pcb_restore_prompt.py": "39e0b8623a838911eff61066f3e9c8ede4364dbf73efc5a8994197ec72a96488",
|
||||
"src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4",
|
||||
"src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63",
|
||||
"src/cbb_refresh_verify/reimport_recovery.py": "ef148549751fa47518f5f2ca8f32ba25794ec5f22e0de545476ea33f89a3f0bf",
|
||||
"src/cbb_refresh_verify/residual_sessions.py": "4ac500b33b209611d54eb496c6c30727ba159742d625431ceea84471a5fc3442",
|
||||
"src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e",
|
||||
"src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367",
|
||||
"src/cbb_refresh_verify/save_verified_block.vbs": "926175562ef82bb2e732231dbc18d8a88059c7e6143c9f4e502cabfd0d170bcd",
|
||||
"src/cbb_refresh_verify/scoped_manifest.py": "9318bf0f929d23c18466a25d83a4a9903822093c123aae10510061788c6d0ab7",
|
||||
"src/cbb_refresh_verify/session_record.py": "2bc3cff365008864584138a4ff13538bb6b2f90d981e7d008a1300f9102c6e7e",
|
||||
"src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196",
|
||||
"src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8",
|
||||
"src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2",
|
||||
"src/cbb_refresh_verify/verify_runner.py": "3027ef7fc1ef6365ff36ae0c83389d869b92ffcd96985d10275bca4dc9483e3f",
|
||||
"src/cbb_refresh_verify/write_admission.py": "e38b460370596f49499fbda3033b2962dda125aa62862fd2327bf6d376d192b9",
|
||||
"src/cbb_refresh_verify/__init__.py": "dd960394d88657820dba858792abf0de258e05efceb08ae2f0b39c6ad78bc469",
|
||||
"src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328",
|
||||
"src/cbb_refresh_verify/assets/dialog_rules.v1.json": "3911080fc799a819662e225a7ad73e883abd8dcc9936cc30ec1b2d6d51a03c6e",
|
||||
"src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599",
|
||||
"src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "ba30b79cd652b74b6e8f438d6bd5f0fc0229594ff4be2358f81c6dd3cb82e77a",
|
||||
"src/cbb_refresh_verify/ui/icdb_check_task.py": "ade3bf414aa29b42f4c1535c613b2cacb2735f6abc7900e6da25999390a5891d",
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "2c919badeeee0280e49387b88b058555a9fa6ace04835c094fccd782bf0af9c0",
|
||||
"src/cbb_refresh_verify/ui/management_dialog.py": "8e2024957be874905685167c7eab440ecee9320170c1553340025b10fa1754d6",
|
||||
"src/cbb_refresh_verify/ui/pcb_open_dialog.py": "3cabdc15f1b2abaeb919a7f29f32d4b053186701fd514646d9bdd3ea32f364f6",
|
||||
"src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da",
|
||||
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "1d2a26bfc7ee21b11d7edbc3074b4c525e8c9fb628bca45b08bd06fc672586c8",
|
||||
"src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888",
|
||||
"src/cbb_refresh_verify/ui/write_owner_dialog.py": "c77f4d57e683fa397a39a573171198922f6158e19a8a96ca3627af60b5a8963f",
|
||||
"src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
|
||||
"tests/button_simulation.py": "3278868565853001103557d5f7ada42b11b05c03feb9032deed0327b6609de2b",
|
||||
"tests/CBBRefresh.Core.Tests.ps1": "e90774cde77189bc577ee374b50a8cc951740d2d3c36c786c73abbd128181a59",
|
||||
"tests/ContentCheck.ExitCode.Tests.ps1": "efa0d1e8a77715932670ab8ac299984e023867d07ff57b09fc7da6d68c4d6fd9",
|
||||
"tests/test_abnormal_shutdown.py": "0abdeaf51e2ffc3f771e09aefa9ec647a72b7f64757c9f3851926fbd392cbbcd",
|
||||
"tests/test_all_buttons.py": "897ae449a15fe36fb6198a947575609346d5ce1a22c0a8c4d2950b9f00035d4f",
|
||||
"tests/test_application.py": "bba12187fca6fee0f4f8862182bb40d939e2995016af2cdbb3fd756f6a99135d",
|
||||
"tests/test_automation_license.py": "45e9c75d0d3e1a76f997f7da4cc87b5eb1b05a4ea2356408725742eac8a09ffb",
|
||||
"tests/test_background_icdb.py": "df9bd9e8252e0dee4527dc6a740c0c33e76d1fb06a79b816cc15809d95716e44",
|
||||
"tests/test_background_queue_regressions.py": "132866bfccc9a7ac5cb234f97aaf6a290e2e4ef949f31e2f70b0f3eafeb99046",
|
||||
"tests/test_backup_recovery.py": "efd88c0c00440ac915b147c2e6dee8044ca805b03f90ab9f171cbde1db11cb9b",
|
||||
"tests/test_backup_recovery_dialog.py": "b2f65864b861d95e99d5efb61ada915ae41973d2b49d08f2d536781997dd00cb",
|
||||
"tests/test_batch_blockers.py": "4387293d3a5820fab630e3c5fe1b424f61ba6947773e5a61125d840433c5c62a",
|
||||
"tests/test_batch_item_yield.py": "ed4be6d1e854b18d054a75c92171cd46b6b64411c2f74e9a3caf31fba3c7366b",
|
||||
"tests/test_batch_status.py": "c1f9af0c7c6f3171b3726fb53346f480b13b8d9cd88111a9c12e2fae2392bbff",
|
||||
"tests/test_batch_status_faults.py": "314e890c9aee439c8a75b4dfd605685240c74f6212da975fd50526bd70b4a0ff",
|
||||
"tests/test_desktop_worker.py": "671d616f04a01d74508b328e3b6fc8f6c7191a91de0dcaa486aa98a3718353ff",
|
||||
"tests/test_diagnostic_open.py": "b44f8f7b171602ad2691ea2e064ac9fe94f2fabb9fcc2eb6760cc1dd365b9423",
|
||||
"tests/test_dialog_agent.py": "8c746e47d55637ca18d7cc998f324a0c2e0a5214dcfe8fcb6458c060619c211c",
|
||||
"tests/test_dialog_models.py": "6902cf5c292458340fb48241b34875e111a0113d706cd82775934a7f72bab7b9",
|
||||
"tests/test_dialog_probe.py": "55c98f6102957a27a96dcfd4f4bf3af499b5055225b77ef93b7b332dfd4ac472",
|
||||
"tests/test_dialog_rules.py": "96bf36493da770679e9207e96b3088ef7f471aea22e17c254f33326ffef0d7f9",
|
||||
"tests/test_dialog_startup_budget.py": "6f23c01836e4894ae82c3345a2383c4f8eb0517056c5b953c43100acd0fc3739",
|
||||
"tests/test_dialog_supervisor.py": "4c1b00050127a65b0a8cf1c7a94fd673431ea3f04b76033a463804d0468ad2d9",
|
||||
"tests/test_extended_safety.py": "7450816abba89aba1f4739f819f43631def82701fe07481279db2b3f3ed96cf6",
|
||||
"tests/test_external_owner_release.py": "675ddbab4a97e86febac3003b9083c259295534941aa0463488a5a1206cfaf92",
|
||||
"tests/test_failed_startup.py": "eca757ea46a4c0aa4fb0368ff53f26822af71612d251ecd87132686fe3c3794b",
|
||||
"tests/test_failure_lifecycle.py": "dfeac56744a44e6f4c7898516749ca478f53d7c7f08b3843a05ef7f448c469a7",
|
||||
"tests/test_icdb_address.py": "cbdc07e5043349c796a4ea1ce3d4989062094cd28929a9ef7d42c5ba75b77907",
|
||||
"tests/test_icdb_batch_check.py": "e83982e0fd0b3744bdc62965b26970ded31aacfedea94283d9e321ef70a8232f",
|
||||
"tests/test_icdb_open_check.py": "1f3750169755d0553bac3e0f8bec244038b84f9cd970e17c9f6eb67dee0e3dba",
|
||||
"tests/test_icdb_recovery.py": "298ddac4b79b4400efc99ff27c58ca49fffea1f401a31071451b2fdaca59036e",
|
||||
"tests/test_import_without_export_gate.py": "ae3dd0fb41c41773ce2d54aa9f9be83bbb56a0d09c59d600b10575fa8f0d2cd4",
|
||||
"tests/test_incident_safety.py": "52f3ccb04db8971bf38628c2bd334d4fd79795e97de6538f6f66cb35f7123ece",
|
||||
"tests/test_independent_operations.py": "4ba5798df3346bce74c3703c158f1dce1d1ba14df748606fcaf900c8568753e0",
|
||||
"tests/test_integration.py": "9e9d30692607c889e1e3744a63c79c68e3af7d4c86804e0bcebe48e68765086c",
|
||||
"tests/test_late_release_continuation.py": "34c62a628cbc08f4e8b9a1919c13f17772a2d26d1996fae34a35f814725b00e2",
|
||||
"tests/test_library_lock.py": "3d65bd941faa441404045ce0140ea3ea5e58fb7d410b7b76bb9f03a9ea03d3af",
|
||||
"tests/test_library_reader.py": "b39a1dc9d99c2463b744141e3c3489cd49ac4a637e7835559a9c3fe9cbafbb58",
|
||||
"tests/test_lifecycle_supervision.py": "cfe29f1e73c6ef38d11e185e211b6e2fb60247f53a44e99dd1e2f8cf7a009faa",
|
||||
"tests/test_maintenance_diagnosis.py": "0849aef555475a03b061eacf499f261fb75f2e727f35dba3cbceafac92e2a638",
|
||||
"tests/test_maintenance_entry.py": "5ed3cda8e0c829fb2964e27f1bdc6fa8ee8dcde93ec63338959bf754b62d6a0b",
|
||||
"tests/test_maintenance_owner_scope.py": "7cf64dc7f2b126684dcac6e619cbd87eca3d85ec2fc1f70f057154679dad6026",
|
||||
"tests/test_maintenance_review.py": "ba807fd8c25c1b52cf2443d8bcf2f57539819715c0bc6c358d31d8542c2e7ce5",
|
||||
"tests/test_maintenance_startup_gate.py": "4f69d33218483a658b51b2012ae8bfa83aff8a787152a38b19dadc4c0d3ffe36",
|
||||
"tests/test_maintenance_ui.py": "2a640ba5e979a3fead81f0a38603b6105ffcb883dbb8484ccc42c99ee8c311db",
|
||||
"tests/test_management.py": "cad0fb43eca9e7022a33a5e9ff0a408465b262fd304b146cdc85c28265f2e74f",
|
||||
"tests/test_management_diagnostics.py": "671a9d7c112ededbee332db9b6fbab786fb37e9367d992f902f3ab2c9f60880b",
|
||||
"tests/test_management_native_transaction.py": "7ca227aae6426c4d0d998edfd8620ec18905aaf212f0be20ceba97b1cde3a9a4",
|
||||
"tests/test_management_probe_guards.py": "ae9be3dbd7c6a616478b7d4ea3498c428ff94a985089fe798463c5cab456f151",
|
||||
"tests/test_management_retry_blockers.py": "124dbef291dbe331ba0c3e7de1665c910ea43e37b1563429b387f0f2233953ee",
|
||||
"tests/test_management_source.py": "16e608ed9c8b0aa81cf08d49f165a33a1403c4ea7f2a5be44e8cfc8cb49850ad",
|
||||
"tests/test_management_supervision.py": "2dcadd6551a94c52e5d4e74285959f10144a89c48af87e508abaea945652d1f6",
|
||||
"tests/test_management_ui.py": "da3e2bc0b5c73926324a539edfa2f718ae1b585df96324a928a0c1a909e48083",
|
||||
"tests/test_manual_backup_ui.py": "927e42ec4a1e0139c71a41b0cad1389ad47b0881381203c18b307cd2d137983a",
|
||||
"tests/test_mentor_paths.py": "a05a91812a74b58e76f36d581216ee43969d2576b8a8e7d1cde3e301c52cf4c1",
|
||||
"tests/test_native_add_failures.py": "ceedd60e030628b1af149d08d16216d5f7158a63686729bb357c148da86fb0ec",
|
||||
"tests/test_native_backup.py": "43ec0c6b14b53864553feaf5d9fb498b37866f24edc486c0749160d3f803db5f",
|
||||
"tests/test_native_engineering_identity.py": "a1adcf6883a9b55c2c37d9f491faf40dd4928f4d8db675419fd288dd31552c69",
|
||||
"tests/test_native_export_guard.py": "f8ec4fa1058af55008e9628f79f2dc70b6e551f36815a812d10bfdf955cada51",
|
||||
"tests/test_native_inspection_release_regressions.py": "8f7bb0b2b641d437872f1dd1d0c2547c2522c81e3c0351c31a7125f751d91927",
|
||||
"tests/test_native_management.py": "badf33d4d00104c7e96e336777fb3e49690cc9db5ce1b071f98520aa5b6668f1",
|
||||
"tests/test_native_management_fields.py": "9917ca0910e19bd809c86d0120c652145261528ace33c3b805f5663442c4a973",
|
||||
"tests/test_native_occupancy.py": "56293dbe24bd3cd4f74cf8208e933faab7d737e5a5684a5d38838d063c3aef6d",
|
||||
"tests/test_native_repair.py": "113185ced72d8f4f4eafca99054d97fe80a504d1c6cc91aaf86f55cea1b7e138",
|
||||
"tests/test_navigation_tabs.py": "d7d5bbfc752f73c1b1d4615ffafc1266e772d96f3f3ba3d82c4b4baf678b292d",
|
||||
"tests/test_network_path.py": "f52624391ae78e9b913dace2b1a9a2875a5855f86dc9e12c324ef493e6c7817b",
|
||||
"tests/test_network_release_safety.py": "caef536d0a40b2eb848c1b8ab095ab374af247c03dd44acf8a70f0f500db6dac",
|
||||
"tests/test_operation_lifecycle.py": "c0ce6c86b73021a8b162ae9e67a10aeec8a27a98e382fd82e1449a451a9a8c3c",
|
||||
"tests/test_operation_queue.py": "8137528603f015695ed4d60a0c8fa8e7bf0a1c4659f8dc2a181291f5d500e6a1",
|
||||
"tests/test_owner_probe.py": "deb757e022980f11ef48e57a2fd002ee3e90ec647a4666a0c4d4427313b6f725",
|
||||
"tests/test_packaging.py": "87a6d04419775c0c5c806e0e569a48d7ef199a0bff8736b211443a1f471e7e8a",
|
||||
"tests/test_packaging_status_bridge.py": "cbfaeac070a1494a1d8609fc25e9a779a63354c8914b4c6c57fdc7c31b70d472",
|
||||
"tests/test_pcb_bridge.py": "527fb63147a203a2e9419da989aff600d3e461580989e39e8ede3a8cc57b901a",
|
||||
"tests/test_pcb_open_consent.py": "5bf9ef6276d221b73ebe0dd14cff4fe5dc11bfec7b8be3266ae4a6b6a588d354",
|
||||
"tests/test_pcb_restore_prompt.py": "a005691d0296587e520e20c4430e9e55227d767c8e910e950a9f2e93aeccb2c7",
|
||||
"tests/test_pcb_version_choice.py": "0825c28333e4ed4f5a63847b6f5bb11143e922c7203d2770ce9c78fc8edec20f",
|
||||
"tests/test_post_repair_consent.py": "bf417b378255386dc97ad8efdf5003b0691aa5d69da9d9256aa367dc16a2d4bb",
|
||||
"tests/test_post_verify_diagnostics.py": "212857e56581998a3a3cd53635030b68a089fc4d630a8b0ee7ef3f137090dcc4",
|
||||
"tests/test_private_desktop_discovery.py": "5361493313ae6864e252cdb9f2c72e71b39264a1c022beb4cf0c04c143cdd91e",
|
||||
"tests/test_readonly_status_policy.py": "3ed40d7bdf2d3e6f70b38803b89a8b982336556444b45c6ba6b0a7c6df52a97f",
|
||||
"tests/test_reimport_recovery.py": "875e5e2a0f6251ec5a251457848c7eac5dfd1674fcbb4745155f6d5d8bf4a4be",
|
||||
"tests/test_residual_release_dialog.py": "10b23d009703d542e5ce8ecb35a4833e0135bb8852b4116e49eedc7010397a1e",
|
||||
"tests/test_residual_sessions.py": "2c51ed1dc95a3afa7ebb24027963dfa9d13aba9c407e508e22ccc6e9f762dfeb",
|
||||
"tests/test_review313_residual_isolation.py": "52a8024ed4e2a7fed219fe46cacdf76fa971166feedd557206716ef7f6d3c914",
|
||||
"tests/test_review326_dispatch_and_receipts.py": "ce4d529246da1c4d53c3dec70ef49542165064404301dec3e32851df62492ecf",
|
||||
"tests/test_review326_queue_guidance.py": "c2c97aceddd9713618afdd5f2a7be4764b56a1b62fc672282fb8c218b4969c74",
|
||||
"tests/test_review345_ui_cli.py": "795e7e4f9bda8874c6a65a08863cab19f4adb3412287276ee2960588f0fd2fa8",
|
||||
"tests/test_review348_release_comparison.py": "ceccdb3d6f7bc6cb65562c059f13aa2bc5d89d98c6f64b0f11d9b943ebbde165",
|
||||
"tests/test_review381_queue_release.py": "e0d62424cbf70ec9573db78ede0a4c6534775399194eed4c6b28ba8d468307be",
|
||||
"tests/test_review391.py": "304d46d63af87ea4a9bca83834b77cc44c5c9addf7b0f3752431304ee612568c",
|
||||
"tests/test_review414_export_and_audit.py": "ec785c2656bed97de6c8467885f2ad0877b55ee872b02928744d399e8767d8a0",
|
||||
"tests/test_review414_open_and_queue.py": "db065207dacaccd0bd80af52c1f1edaf36a278e7cf2dce7c9b44bc51dd0e1cec",
|
||||
"tests/test_review414_write_admission.py": "604ee7429053d408943a1d74b18c6bbf2de817e9e0b76c82abe7a1faceafdf9f",
|
||||
"tests/test_review_319.py": "831fd34d426abb4436b9132bfb7ed754994155a34ac60a59378dee0964b54d28",
|
||||
"tests/test_review_backend_followup.py": "2f3f51a72ecd05fc33c6b5a8dddaecfd12d2b50df423c87b4c18d1e52b2609bd",
|
||||
"tests/test_review_foreign_release_evidence.py": "cbf2af02418f6bd3ec720a7a7658cf97f06d1a6e12009fdff2a99f465711591e",
|
||||
"tests/test_review_management_ui_followup.py": "746602a84c3ba9cb041c5dd354b39d344355b71a3666b27a47eb9aee231e171c",
|
||||
"tests/test_review_release_followup.py": "ab375f67e63cf3f33fa67ce19058be442c2ec56f810d4fc58ef5484272cbda49",
|
||||
"tests/test_runtime_timing.py": "7152cd8fedfe165e769dadc1238c347d9f4d3e93cd57f6ed991e14d959e720f7",
|
||||
"tests/test_safety.py": "ccf5febaf0a974d5e5357398a6946d3f121e07a6247c2f0dc5b71d86b39cac52",
|
||||
"tests/test_save_helper_identity.py": "178a68c4a9a8c618dad3d8393e816dd1d2a16aef8d1fb9984117fe9dc8d06add",
|
||||
"tests/test_save_helper_runtime.py": "00b092ec799da4bca424e1ee63a83bee783c81dbcdc20b7526fda8b45bb4b72a",
|
||||
"tests/test_scan_isolation.py": "cab02bfe55ed515f889d3fcba6e6880344f482cc3a78a072b543b7a871cf92ab",
|
||||
"tests/test_scoped_manifest.py": "fe9b2047d2c43812e851dd89ff250a2e5907dda89b3f5d9ae0a4dc4c5f452eac",
|
||||
"tests/test_session_record.py": "6b51b19adfb232275195da7ff1ba91a5ce5e296f9424a7a1a29fc67ecfdfb108",
|
||||
"tests/test_status_bridge.py": "fe1c0632d4d5fd5a1caf221903d4cfe38eda62aaa4298e3438735e31b8459ab2",
|
||||
"tests/test_status_bridge_server.py": "7d8cd72d69afae0f96ebbd9bb3be2ae3c222f01108e45ab51a09e54d4d8527cc",
|
||||
"tests/test_ui.py": "306a66698296a050744869b0756ddd0eefee5019618ff90b684da136a9787854",
|
||||
"tests/test_ui_batch_safety.py": "12a8d82d4aedbeee315a02a49ec0e9888547ad4abd63e181e7f392b2a39e26dc",
|
||||
"tests/test_ui_filters.py": "155e8f72d18c5c76b353d4b99f3828339c80908a9910f01641ba5c32a3929c75",
|
||||
"tests/test_ui_lease_lifecycle.py": "18ea8af868373fa795a4911754be55068fe75833ce35579c1212fd7f4713f149",
|
||||
"tests/test_verify_diagnostics.py": "b6431194e9f4c86a42110cac0d5f712c27b063f43b4ce820327aded81602908c",
|
||||
"tests/test_verify_probe.py": "aeb65b5bd2df14e8a8f3ba5501855b5946e6f8a22f0d26960c00ff1b0daea56b",
|
||||
"tests/test_verify_runner.py": "e58619f55873302c39129ce50e50fb25173a96ab309d975aa4f47f0bd3459fbb",
|
||||
"tests/test_verify_worker_stability.py": "eae03400c2e3c8a0bc339c8dc05d890403c6bfb4c6d70d0361bc1b882b47d618",
|
||||
"tests/fixtures/icdb-repair-startup-windows-sanitized.json": "a7fe3a34d47fb36d7f98ca8c1df4bb9a50d5faa9aee5bf76db5dbc3f3d06d03d",
|
||||
"tests/fixtures/issue2-lost-session-sanitized.json": "7ed4b567acabb38ff643ebd2c5b3d90b4fd9f33368f67ce3f436ba93ccf24519",
|
||||
"tests/fixtures/pcb-version-choice-sanitized.json": "ce0cb6d9135970cb4fbfa31fa057271b174dc37e57d90a5d4ac9ecf3ebabddfd",
|
||||
"tests/support/runtime_lifecycle_frozen_boundaries.py": "bf98533a1c06ccf4453d20b3804323779719e697141b8dc64fa679960a979cfd",
|
||||
"tests/support/runtime_lifecycle_frozen_fixture.py": "b87761c06a300f0d93bce864d3d31e045f2135324b2a9a42f8682ccbff09ad22",
|
||||
"tests/support/runtime_lifecycle_frozen_smoke.py": "b11e0aac71c1079625ac9832dc5c38197bc80110478c4d9e02c2a3bc58a2a2d0"
|
||||
},
|
||||
"automatic_icdb_repair": false,
|
||||
"merged": false,
|
||||
"published": false,
|
||||
"limitations": [
|
||||
"Real field lost-server-session recovery is not accepted.",
|
||||
"Windows 10 and cross-machine SMB not tested.",
|
||||
"PCB sharing-violation regression uses real Win32 handles with controlled callback; no claim of field popup repair acceptance.",
|
||||
"Long native Add waits remain undiagnosed.",
|
||||
"Preexisting LibraryManager still prevents native catalog activation; user must close it normally before continuing. Multi-client COM ownership is not verified.",
|
||||
"Unknown-client consent is user attestation, not proof of future native ownership."
|
||||
]
|
||||
}
|
||||
@@ -1,64 +0,0 @@
|
||||
# PR #13 评论 414 修复与验证
|
||||
|
||||
审查基准为 main `cbc57238496bc84f4228aa44929208a9516dff1b`;本轮修改基于
|
||||
`1572e2d`,保留正常导入与可选导出诊断解耦。审查链接:
|
||||
https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-414
|
||||
|
||||
## 审查意见处理
|
||||
|
||||
| 意见 | 处理及验证 |
|
||||
| --- | --- |
|
||||
| P2-1 未知原生进程在写前被忽略 | 仅在中心库写入和备份替换时要求明确选择继续、跳过本项或取消批次。许可限定本批次、目标库、PID/创建时间/映像/用户/会话,先落盘后生效。实际目标进程、数据库句柄冲突和地址记录不能用此确认绕过。确认后重新查询进程及资源。 |
|
||||
| P2-2 独占探测句柄跨越原生“读写打开”点击 | 退出 resource_guard、释放句柄并重核原生进程身份后才派发点击;保留实时窗口身份核对及单次回答。真实 Windows CreateFile 回归试验在原实现产生 sharing violation,修复后读写打开成功。 |
|
||||
| 后台读 QWidget / 使用当前库 | 队列、批次结束刷新及备份会话读取使用请求绑定的库;后台缺少显式库参数直接拒绝,避免从控件推导。Qt 工作线程回归试验验证不再读取 lmc_edit.text。 |
|
||||
| 导出预存进程豁免偏宽 | 需要最新快照的创建时间与完整映像匹配;当前绑定副本或归属未知的原生客户端不豁免。相同创建时间但映像冲突不能解释为原进程已退出。内存和磁盘释放路径均有测试。 |
|
||||
| 非 checkpoint 租约不落盘 | 此描述不准确:已有 LibraryLock 会写入并 flush `.lock` 审计文本(机器/PID/时间/库),原生校验另有 session 记录。增加实测断言;审计不是占用证明,不增加新阻塞记录。 |
|
||||
| 历史测试数字缺少复现信息 | 见下表及命令;区分记录提交和精确被测树,不用单个旧提交冒充混合工作树。 |
|
||||
|
||||
整批校验和 ICDB 检查仍独立。未知进程确认不会关闭这些进程。用户需要确认它们在本批次完成前不使用目标库;程序仍无法仅凭命令行证明另一个客户端未来不会打开此库。
|
||||
|
||||
独立复核另发现两个集成缺陷:确认记录创建恢复目录后,恢复再次以独占方式创建同名目录;以及调用方未传 Event 时“取消本批次”仍执行下一项。均先以回归测试复现,再修复;跳过继续、取消停止,新出现进程和记录写盘失败也有覆盖。
|
||||
|
||||
## 历史测试数字的来源与复现边界
|
||||
|
||||
| 数字 | 保存记录的提交 | 原始证据 |
|
||||
| --- | --- | --- |
|
||||
| 1775 | `fdd07224aac99bee8d1f29e8e82d6a2c49964c87` | `2026-11-09-full-review-followup-validation.json`:四个分支 head、27 个被测文件散列、XML 路径与散列。 |
|
||||
| 1851 | `42d0cebc54191681b53dcecb120f53236c1963bb` | `2026-11-12-native-acceptance-validation.json`:baseline `b86e4e3`、XML 结果、candidate-release4/source-sha256.json。 |
|
||||
| 1880 | `466f400514acc8531a219db8e75641be35304a3f` | `2026-11-12-scoped-release-validation.json`:full-scoped-final10.xml、冻结包散列。 |
|
||||
|
||||
本轮从以上三个提交分别导出干净快照,设置各自 PYTHONPATH 后运行
|
||||
`python -X utf8 -m pytest --collect-only -q tests`,实际分别收集到
|
||||
1775 / 1851 / 1880 项;对应记录的 27 / 70 / 72 个文件散列均与这些提交一致。
|
||||
以上提交可作为复现入口,但本轮没有重跑三份历史全套测试,收集数量不等于重新验证通过。
|
||||
历史记录未覆盖的测试文件及外部环境不能靠这项散列核对证明完全相同。
|
||||
|
||||
当前版本可从本修复提交干净检出后运行以下命令。必须显式设置 PYTHONPATH,避免可编辑安装及测试子进程加载到另一份工作区:
|
||||
|
||||
```powershell
|
||||
$env:PYTHONPATH = (Resolve-Path ./src).Path
|
||||
python -X utf8 -m pytest -q tests --junitxml=full-suite.xml
|
||||
python -X utf8 -m pytest -q tests/test_review414_open_and_queue.py tests/test_review414_write_admission.py tests/test_review414_export_and_audit.py --junitxml=review414.xml
|
||||
python -X utf8 -m compileall -q src tests
|
||||
git diff --check
|
||||
```
|
||||
|
||||
本轮实际命令、XML、源码散列、冻结包核对及隔离原生操作结果见相邻
|
||||
`2026-11-13-review-414-validation.json`。
|
||||
|
||||
全量 1912 项通过后新增两个边界用例,追加的 14 项测试全部通过(其中 12 项与全量重合,合计 1914 个不同用例)。
|
||||
冻结包 66 个模块与当前源码一致,图标及资源一致。隔离空库的实际按钮操作得到:
|
||||
取消仅产生一个 CANCELLED;新批次第一项 SKIPPED、第二项 UPLOADED,独立读取只确认第二个工程。
|
||||
两个来源目录的工程内容清单保持一致,程序与原生任务正常退出。
|
||||
“继续”之前由测试用户正常关闭本任务创建的空 LibraryManager;没有强制终止外部软件。
|
||||
两轮旧驱动卡在模态窗的 UIA 读取、一次保留 LibraryManager 导致原生拒绝,以及一次回归测试与原生试验并行造成互斥拒绝,均保留原记录,不计为通过。
|
||||
|
||||
## 验收边界
|
||||
|
||||
本轮不启用自动 ICDB Repair,不关闭现场工单。Windows 10、跨机器 SMB、现场服务器会话失联完整修复未验收。原生 Add 长等待的原因尚未定位;这轮不以缩短超时掩盖它。当前云端发布包保持不变。
|
||||
|
||||
冻结包实测额外确认一项既有边界:原生 `_catalog_com` 仍要求启动前没有其他
|
||||
LibraryManager,避免将其他客户端错误登记为本次所有者。因此当未知客户端恰为
|
||||
LibraryManager 时,选择继续仍可能得到“已有 Library Manager 运行”;确认不会绕过该原生入口限制。
|
||||
并行 LibraryManager 的隔离接入需要单独验证 COM 返回对象与窗口/PID 的精确归属,
|
||||
本轮没有直接删除检查。该失败试验及正常关闭测试会话后重试的结果分别保留。
|
||||
@@ -1,309 +0,0 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"created": "2026-11-16T10:04:07.868924+08:00",
|
||||
"review": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-430",
|
||||
"base_commit": "fee4a67",
|
||||
"code_commit": "fa5590468d62d7b4605f73e09fe961416020727c",
|
||||
"environment": {
|
||||
"windows": [
|
||||
"11",
|
||||
"10.0.26200",
|
||||
"SP0",
|
||||
"Multiprocessor Free"
|
||||
],
|
||||
"python": "3.12.10",
|
||||
"mentor": "EE7.9.5"
|
||||
},
|
||||
"full_suite": {
|
||||
"local_path": "F:\\CbbReview414\\review430-full.xml",
|
||||
"sha256": "dda0f591d2652fc39622a62fb3767cfd4eba5420fa099dcfa7aa87b14733dee5",
|
||||
"tests": 1924,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 316.455
|
||||
},
|
||||
"focused_suite": {
|
||||
"local_path": "F:\\CbbReview414\\review430-focused.xml",
|
||||
"sha256": "a09dac537ddf2adc8f014cfeea58454e3c05a1f0fe3ea8abd784f81b8843832e",
|
||||
"tests": 89,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 32.99
|
||||
},
|
||||
"red_reproduction": {
|
||||
"local_path": "F:\\CbbReview414\\review430-red.xml",
|
||||
"sha256": "a0280295b7415e28974227b8a94bc62612b45d4903c1e0257ba269e37a149d7c",
|
||||
"tests": 10,
|
||||
"failures": 7,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 7.787
|
||||
},
|
||||
"commands": [
|
||||
"PYTHONPATH=<checkout>/src python -X utf8 -m pytest -q tests --junitxml=full-suite.xml",
|
||||
"python -X utf8 -m compileall -q src tests",
|
||||
"git diff --check",
|
||||
"python -X utf8 <local-evidence-root>/build.py",
|
||||
"python -X utf8 <local-evidence-root>/verify_bundle.py",
|
||||
"python -X utf8 <local-evidence-root>/driver.py"
|
||||
],
|
||||
"compileall_passed": true,
|
||||
"diff_check_passed": true,
|
||||
"bundle": {
|
||||
"module_count": 66,
|
||||
"source_and_frozen_code_equal": true,
|
||||
"source_sha256_checked": true,
|
||||
"packaged_assets_equal": true,
|
||||
"exe_icon_images_equal": true,
|
||||
"executable_sha256": "ab02971c5bd8e46881433b66922e927075ab0cea7c18fb7f79243089de97ce22"
|
||||
},
|
||||
"smoke": {
|
||||
"backup_status": "SKIPPED",
|
||||
"backup_target_unchanged": true,
|
||||
"management": [
|
||||
{
|
||||
"name": "1GPHY_RTL8211F",
|
||||
"status": "SKIPPED",
|
||||
"safe_to_continue": true,
|
||||
"evidence_path": "F:\\CbbReview430\\data\\management\\management-c1bb58f1e8f543f68453c03c138deba0\\checkpoint.json"
|
||||
},
|
||||
{
|
||||
"name": "1GPHY_RTL8211F_A",
|
||||
"status": "UPLOADED",
|
||||
"safe_to_continue": true,
|
||||
"evidence_path": "F:\\CbbReview430\\data\\management\\management-c6a380a4685a41669f5d2fc615de3756\\checkpoint.json"
|
||||
}
|
||||
],
|
||||
"readback_names": [
|
||||
"1GPHY_RTL8211F",
|
||||
"1GPHY_RTL8211F_A"
|
||||
],
|
||||
"sources_unchanged": true,
|
||||
"choices": [
|
||||
"skip",
|
||||
"skip",
|
||||
"continue"
|
||||
],
|
||||
"client_normal_quit_before_continue": true,
|
||||
"app_exit_code": 0
|
||||
},
|
||||
"smoke_evidence": {
|
||||
"local_path": "F:\\CbbReview430\\smoke.json",
|
||||
"sha256": "e3903cc6c2eb9e8cb4c7c3a4f83036703cd60622f0ced3211be8de8a9c52956c"
|
||||
},
|
||||
"actions": {
|
||||
"local_path": "F:\\CbbReview430\\actions.jsonl",
|
||||
"sha256": "2e442ac332fb56bf355f69254283361dab386634972fac6e1a6cc5b0649a9806"
|
||||
},
|
||||
"source_manifest": {
|
||||
"local_path": "F:\\CbbReview430\\candidate\\source-sha256.json",
|
||||
"sha256": "76cfa8ab47243c569ab9ee284b5c66df4b3f9eca7bfa0dae19a236a9c2ee1035"
|
||||
},
|
||||
"code_review": "Independent read-only review: no actionable findings; ready for PR after full suite.",
|
||||
"warning": "Existing pywinauto Revert to STA COM threading mode warning.",
|
||||
"evidence_note": "local_path values name local audit artifacts, not public download locations; redact before external sharing.",
|
||||
"source_sha256": {
|
||||
"src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057",
|
||||
"src/cbb_refresh_verify/backup_recovery.py": "1d7ef08ef53ca7a0971cdacb0908d9bb06d067b06dc2329fa58722ce9068921d",
|
||||
"src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a",
|
||||
"src/cbb_refresh_verify/close_failed_block.vbs": "e5f0d9678e07a239e96e634b90cdc761de52fc136311fae31484fa38d6fd9781",
|
||||
"src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35",
|
||||
"src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9",
|
||||
"src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3",
|
||||
"src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92",
|
||||
"src/cbb_refresh_verify/diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072",
|
||||
"src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b",
|
||||
"src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56",
|
||||
"src/cbb_refresh_verify/dialog_probe.py": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e",
|
||||
"src/cbb_refresh_verify/dialog_rules.py": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5",
|
||||
"src/cbb_refresh_verify/dialog_supervisor.py": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247",
|
||||
"src/cbb_refresh_verify/failed_session.py": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09",
|
||||
"src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98",
|
||||
"src/cbb_refresh_verify/icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03",
|
||||
"src/cbb_refresh_verify/icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360",
|
||||
"src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed",
|
||||
"src/cbb_refresh_verify/library_lock.py": "6836ec8ac21e788eb75326ff44cb31ad4bdfb5f381bd35cdf33e6b34c7fca89e",
|
||||
"src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195",
|
||||
"src/cbb_refresh_verify/library_reader.py": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438",
|
||||
"src/cbb_refresh_verify/maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990",
|
||||
"src/cbb_refresh_verify/management.py": "7ead9bfffeb44201e44f73d9f039590f091e9a456982f2110dca8ec3695f8803",
|
||||
"src/cbb_refresh_verify/management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0",
|
||||
"src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638",
|
||||
"src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116",
|
||||
"src/cbb_refresh_verify/models.py": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105",
|
||||
"src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94",
|
||||
"src/cbb_refresh_verify/native_backup.py": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d",
|
||||
"src/cbb_refresh_verify/native_engineering_identity.py": "8c0fc144707d68a9b85f6da50ef950f1f6e7fee248acbf34d19b707d51212be0",
|
||||
"src/cbb_refresh_verify/native_export_guard.py": "523cdf44db8e1665634feadba963ccf26777dc8942fb2eb604d2c30bbe92cbb6",
|
||||
"src/cbb_refresh_verify/native_management.py": "eb2ec311489eaf5deb06893a54a02469c9b2bb9baccbdd6563bae295aafcf363",
|
||||
"src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49",
|
||||
"src/cbb_refresh_verify/native_repair.py": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98",
|
||||
"src/cbb_refresh_verify/native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393",
|
||||
"src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f",
|
||||
"src/cbb_refresh_verify/operation_lifecycle.py": "3838c5a501711d16f578c45ebbc6f960872b0c3ba6bbda9a597f994ef746cef6",
|
||||
"src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f",
|
||||
"src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903",
|
||||
"src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5",
|
||||
"src/cbb_refresh_verify/pcb_open_consent.py": "59b6998afab074a98a1bf7eb0d05f2347ccb642b3b217e399ea856a5a8b1c56b",
|
||||
"src/cbb_refresh_verify/pcb_restore_prompt.py": "39e0b8623a838911eff61066f3e9c8ede4364dbf73efc5a8994197ec72a96488",
|
||||
"src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4",
|
||||
"src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63",
|
||||
"src/cbb_refresh_verify/reimport_recovery.py": "ef148549751fa47518f5f2ca8f32ba25794ec5f22e0de545476ea33f89a3f0bf",
|
||||
"src/cbb_refresh_verify/residual_sessions.py": "4ac500b33b209611d54eb496c6c30727ba159742d625431ceea84471a5fc3442",
|
||||
"src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e",
|
||||
"src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367",
|
||||
"src/cbb_refresh_verify/save_verified_block.vbs": "926175562ef82bb2e732231dbc18d8a88059c7e6143c9f4e502cabfd0d170bcd",
|
||||
"src/cbb_refresh_verify/scoped_manifest.py": "9318bf0f929d23c18466a25d83a4a9903822093c123aae10510061788c6d0ab7",
|
||||
"src/cbb_refresh_verify/session_record.py": "2bc3cff365008864584138a4ff13538bb6b2f90d981e7d008a1300f9102c6e7e",
|
||||
"src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196",
|
||||
"src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8",
|
||||
"src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2",
|
||||
"src/cbb_refresh_verify/verify_runner.py": "3027ef7fc1ef6365ff36ae0c83389d869b92ffcd96985d10275bca4dc9483e3f",
|
||||
"src/cbb_refresh_verify/write_admission.py": "0f8280912ec5c7af07a5f08b62a6b2cf7c95f93c745b443d0c7812d752558ce3",
|
||||
"src/cbb_refresh_verify/__init__.py": "dd960394d88657820dba858792abf0de258e05efceb08ae2f0b39c6ad78bc469",
|
||||
"src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.ico": "62d4472ebaa94f9b39aebae06459685d3322041d0e1a7ada9f368cfd816ba1d6",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.png": "840f657fd7c622d9afd78625a64ed8ad04c90a895dd3c9fd37eebae543cdebe8",
|
||||
"src/cbb_refresh_verify/assets/cbb_refresh_verify.svg": "cbba5b3f339cbeb5eb43012709237359442ef67c69fc5b6679a8ee4c0a1b7328",
|
||||
"src/cbb_refresh_verify/assets/dialog_rules.v1.json": "3911080fc799a819662e225a7ad73e883abd8dcc9936cc30ec1b2d6d51a03c6e",
|
||||
"src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599",
|
||||
"src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "be4796d664b8bc812244ced70f4cb616e433cef698813787f68d74408cd5cbbd",
|
||||
"src/cbb_refresh_verify/ui/icdb_check_task.py": "ade3bf414aa29b42f4c1535c613b2cacb2735f6abc7900e6da25999390a5891d",
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "2c919badeeee0280e49387b88b058555a9fa6ace04835c094fccd782bf0af9c0",
|
||||
"src/cbb_refresh_verify/ui/management_dialog.py": "8e2024957be874905685167c7eab440ecee9320170c1553340025b10fa1754d6",
|
||||
"src/cbb_refresh_verify/ui/pcb_open_dialog.py": "3cabdc15f1b2abaeb919a7f29f32d4b053186701fd514646d9bdd3ea32f364f6",
|
||||
"src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da",
|
||||
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "1d2a26bfc7ee21b11d7edbc3074b4c525e8c9fb628bca45b08bd06fc672586c8",
|
||||
"src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888",
|
||||
"src/cbb_refresh_verify/ui/write_owner_dialog.py": "00c6091cc7d6109e41cdc3f9433b55c24725be444e440b894af21cbf751537c3",
|
||||
"src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
|
||||
},
|
||||
"tests_sha256": {
|
||||
"tests/button_simulation.py": "3278868565853001103557d5f7ada42b11b05c03feb9032deed0327b6609de2b",
|
||||
"tests/test_abnormal_shutdown.py": "0abdeaf51e2ffc3f771e09aefa9ec647a72b7f64757c9f3851926fbd392cbbcd",
|
||||
"tests/test_all_buttons.py": "897ae449a15fe36fb6198a947575609346d5ce1a22c0a8c4d2950b9f00035d4f",
|
||||
"tests/test_application.py": "bba12187fca6fee0f4f8862182bb40d939e2995016af2cdbb3fd756f6a99135d",
|
||||
"tests/test_automation_license.py": "45e9c75d0d3e1a76f997f7da4cc87b5eb1b05a4ea2356408725742eac8a09ffb",
|
||||
"tests/test_background_icdb.py": "df9bd9e8252e0dee4527dc6a740c0c33e76d1fb06a79b816cc15809d95716e44",
|
||||
"tests/test_background_queue_regressions.py": "132866bfccc9a7ac5cb234f97aaf6a290e2e4ef949f31e2f70b0f3eafeb99046",
|
||||
"tests/test_backup_recovery.py": "efd88c0c00440ac915b147c2e6dee8044ca805b03f90ab9f171cbde1db11cb9b",
|
||||
"tests/test_backup_recovery_dialog.py": "b2f65864b861d95e99d5efb61ada915ae41973d2b49d08f2d536781997dd00cb",
|
||||
"tests/test_batch_blockers.py": "4387293d3a5820fab630e3c5fe1b424f61ba6947773e5a61125d840433c5c62a",
|
||||
"tests/test_batch_item_yield.py": "ed4be6d1e854b18d054a75c92171cd46b6b64411c2f74e9a3caf31fba3c7366b",
|
||||
"tests/test_batch_status.py": "c1f9af0c7c6f3171b3726fb53346f480b13b8d9cd88111a9c12e2fae2392bbff",
|
||||
"tests/test_batch_status_faults.py": "314e890c9aee439c8a75b4dfd605685240c74f6212da975fd50526bd70b4a0ff",
|
||||
"tests/test_desktop_worker.py": "671d616f04a01d74508b328e3b6fc8f6c7191a91de0dcaa486aa98a3718353ff",
|
||||
"tests/test_diagnostic_open.py": "b44f8f7b171602ad2691ea2e064ac9fe94f2fabb9fcc2eb6760cc1dd365b9423",
|
||||
"tests/test_dialog_agent.py": "8c746e47d55637ca18d7cc998f324a0c2e0a5214dcfe8fcb6458c060619c211c",
|
||||
"tests/test_dialog_models.py": "6902cf5c292458340fb48241b34875e111a0113d706cd82775934a7f72bab7b9",
|
||||
"tests/test_dialog_probe.py": "55c98f6102957a27a96dcfd4f4bf3af499b5055225b77ef93b7b332dfd4ac472",
|
||||
"tests/test_dialog_rules.py": "96bf36493da770679e9207e96b3088ef7f471aea22e17c254f33326ffef0d7f9",
|
||||
"tests/test_dialog_startup_budget.py": "6f23c01836e4894ae82c3345a2383c4f8eb0517056c5b953c43100acd0fc3739",
|
||||
"tests/test_dialog_supervisor.py": "4c1b00050127a65b0a8cf1c7a94fd673431ea3f04b76033a463804d0468ad2d9",
|
||||
"tests/test_extended_safety.py": "7450816abba89aba1f4739f819f43631def82701fe07481279db2b3f3ed96cf6",
|
||||
"tests/test_external_owner_release.py": "675ddbab4a97e86febac3003b9083c259295534941aa0463488a5a1206cfaf92",
|
||||
"tests/test_failed_startup.py": "eca757ea46a4c0aa4fb0368ff53f26822af71612d251ecd87132686fe3c3794b",
|
||||
"tests/test_failure_lifecycle.py": "dfeac56744a44e6f4c7898516749ca478f53d7c7f08b3843a05ef7f448c469a7",
|
||||
"tests/test_icdb_address.py": "cbdc07e5043349c796a4ea1ce3d4989062094cd28929a9ef7d42c5ba75b77907",
|
||||
"tests/test_icdb_batch_check.py": "e83982e0fd0b3744bdc62965b26970ded31aacfedea94283d9e321ef70a8232f",
|
||||
"tests/test_icdb_open_check.py": "1f3750169755d0553bac3e0f8bec244038b84f9cd970e17c9f6eb67dee0e3dba",
|
||||
"tests/test_icdb_recovery.py": "298ddac4b79b4400efc99ff27c58ca49fffea1f401a31071451b2fdaca59036e",
|
||||
"tests/test_import_without_export_gate.py": "ae3dd0fb41c41773ce2d54aa9f9be83bbb56a0d09c59d600b10575fa8f0d2cd4",
|
||||
"tests/test_incident_safety.py": "52f3ccb04db8971bf38628c2bd334d4fd79795e97de6538f6f66cb35f7123ece",
|
||||
"tests/test_independent_operations.py": "4ba5798df3346bce74c3703c158f1dce1d1ba14df748606fcaf900c8568753e0",
|
||||
"tests/test_integration.py": "9e9d30692607c889e1e3744a63c79c68e3af7d4c86804e0bcebe48e68765086c",
|
||||
"tests/test_late_release_continuation.py": "34c62a628cbc08f4e8b9a1919c13f17772a2d26d1996fae34a35f814725b00e2",
|
||||
"tests/test_library_lock.py": "3d65bd941faa441404045ce0140ea3ea5e58fb7d410b7b76bb9f03a9ea03d3af",
|
||||
"tests/test_library_reader.py": "b39a1dc9d99c2463b744141e3c3489cd49ac4a637e7835559a9c3fe9cbafbb58",
|
||||
"tests/test_lifecycle_supervision.py": "cfe29f1e73c6ef38d11e185e211b6e2fb60247f53a44e99dd1e2f8cf7a009faa",
|
||||
"tests/test_maintenance_diagnosis.py": "0849aef555475a03b061eacf499f261fb75f2e727f35dba3cbceafac92e2a638",
|
||||
"tests/test_maintenance_entry.py": "5ed3cda8e0c829fb2964e27f1bdc6fa8ee8dcde93ec63338959bf754b62d6a0b",
|
||||
"tests/test_maintenance_owner_scope.py": "7cf64dc7f2b126684dcac6e619cbd87eca3d85ec2fc1f70f057154679dad6026",
|
||||
"tests/test_maintenance_review.py": "ba807fd8c25c1b52cf2443d8bcf2f57539819715c0bc6c358d31d8542c2e7ce5",
|
||||
"tests/test_maintenance_startup_gate.py": "4f69d33218483a658b51b2012ae8bfa83aff8a787152a38b19dadc4c0d3ffe36",
|
||||
"tests/test_maintenance_ui.py": "2a640ba5e979a3fead81f0a38603b6105ffcb883dbb8484ccc42c99ee8c311db",
|
||||
"tests/test_management.py": "cad0fb43eca9e7022a33a5e9ff0a408465b262fd304b146cdc85c28265f2e74f",
|
||||
"tests/test_management_diagnostics.py": "671a9d7c112ededbee332db9b6fbab786fb37e9367d992f902f3ab2c9f60880b",
|
||||
"tests/test_management_native_transaction.py": "7ca227aae6426c4d0d998edfd8620ec18905aaf212f0be20ceba97b1cde3a9a4",
|
||||
"tests/test_management_probe_guards.py": "ae9be3dbd7c6a616478b7d4ea3498c428ff94a985089fe798463c5cab456f151",
|
||||
"tests/test_management_retry_blockers.py": "124dbef291dbe331ba0c3e7de1665c910ea43e37b1563429b387f0f2233953ee",
|
||||
"tests/test_management_source.py": "16e608ed9c8b0aa81cf08d49f165a33a1403c4ea7f2a5be44e8cfc8cb49850ad",
|
||||
"tests/test_management_supervision.py": "2dcadd6551a94c52e5d4e74285959f10144a89c48af87e508abaea945652d1f6",
|
||||
"tests/test_management_ui.py": "da3e2bc0b5c73926324a539edfa2f718ae1b585df96324a928a0c1a909e48083",
|
||||
"tests/test_manual_backup_ui.py": "927e42ec4a1e0139c71a41b0cad1389ad47b0881381203c18b307cd2d137983a",
|
||||
"tests/test_mentor_paths.py": "a05a91812a74b58e76f36d581216ee43969d2576b8a8e7d1cde3e301c52cf4c1",
|
||||
"tests/test_native_add_failures.py": "ceedd60e030628b1af149d08d16216d5f7158a63686729bb357c148da86fb0ec",
|
||||
"tests/test_native_backup.py": "43ec0c6b14b53864553feaf5d9fb498b37866f24edc486c0749160d3f803db5f",
|
||||
"tests/test_native_engineering_identity.py": "a1adcf6883a9b55c2c37d9f491faf40dd4928f4d8db675419fd288dd31552c69",
|
||||
"tests/test_native_export_guard.py": "f8ec4fa1058af55008e9628f79f2dc70b6e551f36815a812d10bfdf955cada51",
|
||||
"tests/test_native_inspection_release_regressions.py": "8f7bb0b2b641d437872f1dd1d0c2547c2522c81e3c0351c31a7125f751d91927",
|
||||
"tests/test_native_management.py": "badf33d4d00104c7e96e336777fb3e49690cc9db5ce1b071f98520aa5b6668f1",
|
||||
"tests/test_native_management_fields.py": "9917ca0910e19bd809c86d0120c652145261528ace33c3b805f5663442c4a973",
|
||||
"tests/test_native_occupancy.py": "56293dbe24bd3cd4f74cf8208e933faab7d737e5a5684a5d38838d063c3aef6d",
|
||||
"tests/test_native_repair.py": "113185ced72d8f4f4eafca99054d97fe80a504d1c6cc91aaf86f55cea1b7e138",
|
||||
"tests/test_navigation_tabs.py": "d7d5bbfc752f73c1b1d4615ffafc1266e772d96f3f3ba3d82c4b4baf678b292d",
|
||||
"tests/test_network_path.py": "f52624391ae78e9b913dace2b1a9a2875a5855f86dc9e12c324ef493e6c7817b",
|
||||
"tests/test_network_release_safety.py": "caef536d0a40b2eb848c1b8ab095ab374af247c03dd44acf8a70f0f500db6dac",
|
||||
"tests/test_operation_lifecycle.py": "c0ce6c86b73021a8b162ae9e67a10aeec8a27a98e382fd82e1449a451a9a8c3c",
|
||||
"tests/test_operation_queue.py": "8137528603f015695ed4d60a0c8fa8e7bf0a1c4659f8dc2a181291f5d500e6a1",
|
||||
"tests/test_owner_probe.py": "deb757e022980f11ef48e57a2fd002ee3e90ec647a4666a0c4d4427313b6f725",
|
||||
"tests/test_packaging.py": "87a6d04419775c0c5c806e0e569a48d7ef199a0bff8736b211443a1f471e7e8a",
|
||||
"tests/test_packaging_status_bridge.py": "cbfaeac070a1494a1d8609fc25e9a779a63354c8914b4c6c57fdc7c31b70d472",
|
||||
"tests/test_pcb_bridge.py": "527fb63147a203a2e9419da989aff600d3e461580989e39e8ede3a8cc57b901a",
|
||||
"tests/test_pcb_open_consent.py": "5bf9ef6276d221b73ebe0dd14cff4fe5dc11bfec7b8be3266ae4a6b6a588d354",
|
||||
"tests/test_pcb_restore_prompt.py": "a005691d0296587e520e20c4430e9e55227d767c8e910e950a9f2e93aeccb2c7",
|
||||
"tests/test_pcb_version_choice.py": "0825c28333e4ed4f5a63847b6f5bb11143e922c7203d2770ce9c78fc8edec20f",
|
||||
"tests/test_post_repair_consent.py": "bf417b378255386dc97ad8efdf5003b0691aa5d69da9d9256aa367dc16a2d4bb",
|
||||
"tests/test_post_verify_diagnostics.py": "212857e56581998a3a3cd53635030b68a089fc4d630a8b0ee7ef3f137090dcc4",
|
||||
"tests/test_private_desktop_discovery.py": "5361493313ae6864e252cdb9f2c72e71b39264a1c022beb4cf0c04c143cdd91e",
|
||||
"tests/test_readonly_status_policy.py": "3ed40d7bdf2d3e6f70b38803b89a8b982336556444b45c6ba6b0a7c6df52a97f",
|
||||
"tests/test_reimport_recovery.py": "875e5e2a0f6251ec5a251457848c7eac5dfd1674fcbb4745155f6d5d8bf4a4be",
|
||||
"tests/test_residual_release_dialog.py": "10b23d009703d542e5ce8ecb35a4833e0135bb8852b4116e49eedc7010397a1e",
|
||||
"tests/test_residual_sessions.py": "2c51ed1dc95a3afa7ebb24027963dfa9d13aba9c407e508e22ccc6e9f762dfeb",
|
||||
"tests/test_review313_residual_isolation.py": "52a8024ed4e2a7fed219fe46cacdf76fa971166feedd557206716ef7f6d3c914",
|
||||
"tests/test_review326_dispatch_and_receipts.py": "ce4d529246da1c4d53c3dec70ef49542165064404301dec3e32851df62492ecf",
|
||||
"tests/test_review326_queue_guidance.py": "c2c97aceddd9713618afdd5f2a7be4764b56a1b62fc672282fb8c218b4969c74",
|
||||
"tests/test_review345_ui_cli.py": "795e7e4f9bda8874c6a65a08863cab19f4adb3412287276ee2960588f0fd2fa8",
|
||||
"tests/test_review348_release_comparison.py": "ceccdb3d6f7bc6cb65562c059f13aa2bc5d89d98c6f64b0f11d9b943ebbde165",
|
||||
"tests/test_review381_queue_release.py": "e0d62424cbf70ec9573db78ede0a4c6534775399194eed4c6b28ba8d468307be",
|
||||
"tests/test_review391.py": "304d46d63af87ea4a9bca83834b77cc44c5c9addf7b0f3752431304ee612568c",
|
||||
"tests/test_review414_export_and_audit.py": "ec785c2656bed97de6c8467885f2ad0877b55ee872b02928744d399e8767d8a0",
|
||||
"tests/test_review414_open_and_queue.py": "db065207dacaccd0bd80af52c1f1edaf36a278e7cf2dce7c9b44bc51dd0e1cec",
|
||||
"tests/test_review414_write_admission.py": "b1b18fc69eeb9110baf3a7bb214938d5b8f681d7ad234991c92550210c8bf171",
|
||||
"tests/test_review430.py": "7350f3883ddb9be48cc66fa7b0f612e1b45acf2298c80a7faa3da1f05d6d4c83",
|
||||
"tests/test_review_319.py": "831fd34d426abb4436b9132bfb7ed754994155a34ac60a59378dee0964b54d28",
|
||||
"tests/test_review_backend_followup.py": "2f3f51a72ecd05fc33c6b5a8dddaecfd12d2b50df423c87b4c18d1e52b2609bd",
|
||||
"tests/test_review_foreign_release_evidence.py": "cbf2af02418f6bd3ec720a7a7658cf97f06d1a6e12009fdff2a99f465711591e",
|
||||
"tests/test_review_management_ui_followup.py": "746602a84c3ba9cb041c5dd354b39d344355b71a3666b27a47eb9aee231e171c",
|
||||
"tests/test_review_release_followup.py": "ab375f67e63cf3f33fa67ce19058be442c2ec56f810d4fc58ef5484272cbda49",
|
||||
"tests/test_runtime_timing.py": "7152cd8fedfe165e769dadc1238c347d9f4d3e93cd57f6ed991e14d959e720f7",
|
||||
"tests/test_safety.py": "ccf5febaf0a974d5e5357398a6946d3f121e07a6247c2f0dc5b71d86b39cac52",
|
||||
"tests/test_save_helper_identity.py": "178a68c4a9a8c618dad3d8393e816dd1d2a16aef8d1fb9984117fe9dc8d06add",
|
||||
"tests/test_save_helper_runtime.py": "00b092ec799da4bca424e1ee63a83bee783c81dbcdc20b7526fda8b45bb4b72a",
|
||||
"tests/test_scan_isolation.py": "cab02bfe55ed515f889d3fcba6e6880344f482cc3a78a072b543b7a871cf92ab",
|
||||
"tests/test_scoped_manifest.py": "fe9b2047d2c43812e851dd89ff250a2e5907dda89b3f5d9ae0a4dc4c5f452eac",
|
||||
"tests/test_session_record.py": "6b51b19adfb232275195da7ff1ba91a5ce5e296f9424a7a1a29fc67ecfdfb108",
|
||||
"tests/test_status_bridge.py": "fe1c0632d4d5fd5a1caf221903d4cfe38eda62aaa4298e3438735e31b8459ab2",
|
||||
"tests/test_status_bridge_server.py": "7d8cd72d69afae0f96ebbd9bb3be2ae3c222f01108e45ab51a09e54d4d8527cc",
|
||||
"tests/test_ui.py": "306a66698296a050744869b0756ddd0eefee5019618ff90b684da136a9787854",
|
||||
"tests/test_ui_batch_safety.py": "12a8d82d4aedbeee315a02a49ec0e9888547ad4abd63e181e7f392b2a39e26dc",
|
||||
"tests/test_ui_filters.py": "155e8f72d18c5c76b353d4b99f3828339c80908a9910f01641ba5c32a3929c75",
|
||||
"tests/test_ui_lease_lifecycle.py": "18ea8af868373fa795a4911754be55068fe75833ce35579c1212fd7f4713f149",
|
||||
"tests/test_verify_diagnostics.py": "b6431194e9f4c86a42110cac0d5f712c27b063f43b4ce820327aded81602908c",
|
||||
"tests/test_verify_probe.py": "aeb65b5bd2df14e8a8f3ba5501855b5946e6f8a22f0d26960c00ff1b0daea56b",
|
||||
"tests/test_verify_runner.py": "e58619f55873302c39129ce50e50fb25173a96ab309d975aa4f47f0bd3459fbb",
|
||||
"tests/test_verify_worker_stability.py": "eae03400c2e3c8a0bc339c8dc05d890403c6bfb4c6d70d0361bc1b882b47d618"
|
||||
},
|
||||
"semantic_decision": "File-only identity failure remains RECOVERY_REQUIRED; native exit/resource proof governs independent continuation, and same-target replay remains prohibited.",
|
||||
"merged": false,
|
||||
"published": false,
|
||||
"automatic_icdb_repair": false,
|
||||
"limits": [
|
||||
"Schematic semantic equivalence is not proven by import; UPLOADED is distinct from READY.",
|
||||
"Other LibraryManager must be closed normally before native catalog activation; concurrent COM ownership remains unverified.",
|
||||
"Windows 10, cross-machine SMB and field lost-server-session recovery remain unverified.",
|
||||
"EDIF crash root cause remains undiagnosed; ordinary import does not invoke export."
|
||||
]
|
||||
}
|
||||
@@ -1,63 +0,0 @@
|
||||
# PR #13 后续评论 430
|
||||
|
||||
对应审查:https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-430
|
||||
|
||||
基准为本地 `fee4a67`。新 PR 同时包含 main `cbc5723` 后尚未推送的导入解耦和评论 414 修复。
|
||||
本次为代码候选版,不更新云端 `v0.2.4-beta.2`,不启用自动 ICDB Repair。
|
||||
|
||||
## 三项语义处理
|
||||
|
||||
1. **文件身份不等于原生释放证明。** `capture_registration_identity` 只读文件,不创建原生进程。
|
||||
原生注册及目录重新打开后,必须先确认其会话已退出,才进行文件核对。
|
||||
文件核对异常仍返回该项 `RECOVERY_REQUIRED`,不能改报上传成功、READY,也不能自动重放该目标。
|
||||
后续独立 CBB 可在自身写前检查通过后继续;不把文件读取异常伪装成“原生会话未释放”。
|
||||
代码保留最后一次原生目录读取的退出证明,不再用文件采集对象的同名字段覆盖它。
|
||||
原生释放未确认则拒绝文件采集,后续仍按已有释放证明流程处理。
|
||||
2. **未执行与失败分开。** 无界面无法完成占用确认时返回 `SKIPPED`,保留原因码及“需通过界面确认”的说明。
|
||||
备份替换在安装前跳过或取消,分别返回 `SKIPPED` / `CANCELLED`,界面显示“恢复已跳过” / “恢复已取消”。
|
||||
安装后的失败仍按失败记录,不能被重新解释成未执行。真实占用、身份变化、检查失败仍拒绝操作。
|
||||
3. **避免无等待时的重复探测。** 无未知原生客户端时只做一轮进程查询和资源探测。
|
||||
只要进入未知客户端确认路径,返回后仍重新查询进程并探测资源;不会持有独占句柄等待用户选择。
|
||||
|
||||
整理了新增的确认模块及相关修改的空格、分行,并在 PCB 点击处写明已知取舍:
|
||||
为避免 Mentor 自身的 sharing violation,先关闭独占探测句柄,再复核身份和点击。
|
||||
两者之间仍有短暂竞态窗口,不能当作跨机器资源锁。
|
||||
|
||||
## 验证与复现
|
||||
|
||||
先复现错误再修改:新增 10 项用例中 7 项在旧代码上失败,3 项确认原有边界。
|
||||
针对性 89 项、全量 1924 项通过。冻结包 66 个模块、资源及 PE 图标与源码一致。
|
||||
私有桌面中实际恢复跳过后显示“恢复已跳过”,目标工程内容未变;
|
||||
批量新增第一项 SKIPPED、第二项 UPLOADED,独立目录重新读取确认新增条目存在。
|
||||
两个来源工程保持一致,程序退出码为 0。本轮未启用上传后自动 Verify,因此不声称 READY。
|
||||
完整结果见相邻
|
||||
`2026-11-16-review-430-validation.json`。
|
||||
|
||||
在 Windows Python 3.12、已安装项目依赖的干净工作树执行:
|
||||
|
||||
```powershell
|
||||
$env:PYTHONPATH = (Resolve-Path ./src).Path
|
||||
python -X utf8 -m pytest -q tests --junitxml=full-suite.xml
|
||||
python -X utf8 -m pytest -q tests/test_review430.py tests/test_review414_write_admission.py tests/test_import_without_export_gate.py tests/test_management_native_transaction.py tests/test_backup_recovery.py tests/test_backup_recovery_dialog.py
|
||||
python -X utf8 -m compileall -q src tests
|
||||
git diff --check
|
||||
```
|
||||
|
||||
包含全局任务互斥的测试与实际 Mentor 试验串行执行。
|
||||
验证 JSON 中列出的本机证据路径仅供本次审计,不作为其他机器可直接访问的下载路径。
|
||||
未入库的 XML、进程记录、截图及冻结程序按文件散列关联;外发前需处理本机路径和工程名称。
|
||||
|
||||
## 产品与验收边界
|
||||
|
||||
正常导入确认原生注册、名称/分区、工程引用、允许的顶层块和 Layout;原生重写后的 ICDB 字节不作原理图语义等价证明。
|
||||
`schematic_semantics_checked=False` 保持明确;上传成功不等于 READY,完整 Verify 为独立、可选步骤。
|
||||
单项输入或可选 Verify 失败不阻止已释放的独立 CBB 继续,这与本轮用户确认的行为一致。
|
||||
|
||||
原生 COM 入口仍拒绝已有其他 LibraryManager 的情况,未冒险将其他客户端登记为本任务所有者;
|
||||
用户可正常关闭相关会话再继续。EDIF 崩溃根因、Windows 10、跨机器 SMB 和现场服务器会话失联修复仍未验收。
|
||||
本次实际按钮试验只操作隔离库及本任务创建的空会话,不关闭用户的其他程序。
|
||||
|
||||
## 回滚
|
||||
|
||||
通过 revert 新 PR 合入的提交回滚程序代码;云端旧发布包不受该 PR 自动影响。
|
||||
程序回滚不会撤销用户已完成的库写入:根据逐项检查点与人工备份恢复,不自动重放管理任务。
|
||||
@@ -1,257 +0,0 @@
|
||||
{
|
||||
"schema_version": 1,
|
||||
"created": "2026-11-16T14:36:55.137608+08:00",
|
||||
"base_commit": "e4875b4eca1bc487514d479df15f2a4ac92df5e3",
|
||||
"branch": "codex/unattended-prompt-defaults",
|
||||
"full_suite": {
|
||||
"path": "F:\\CbbUnattended-20261116\\full-final.xml",
|
||||
"sha256": "8717cf87707b525a17eb2a3a292677360eade0d374e7d6eb42a6c2d07209d520",
|
||||
"tests": 1937,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0
|
||||
},
|
||||
"red_original_no_timeout": {
|
||||
"path": "F:\\CbbUnattended-20261116\\red.xml",
|
||||
"sha256": "b0c46ca9c76ce41f9c9053ec94a08d416a3b18d775f3d9e3af1d469ac96b1225",
|
||||
"tests": 3,
|
||||
"failures": 3,
|
||||
"errors": 0,
|
||||
"skipped": 0
|
||||
},
|
||||
"button_and_prompt_integration": {
|
||||
"path": "F:\\CbbUnattended-20261116\\integration-final.xml",
|
||||
"sha256": "002f68c353fdf3a6e5eacfd2596df8b15f30a8a76ef3c262d2da3fc64e35a202",
|
||||
"tests": 100,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0
|
||||
},
|
||||
"first_full_run": {
|
||||
"path": "F:\\CbbUnattended-20261116\\full-suite.xml",
|
||||
"sha256": "a6d2d5fe0d240ede5a90fff7b8f4c70635c12b82ef3423185c8ee975db17bf53",
|
||||
"tests": 1935,
|
||||
"failures": 6,
|
||||
"errors": 2,
|
||||
"skipped": 0
|
||||
},
|
||||
"first_full_run_explanation": "Four notification tests expected the old OK button; two recovery-summary paths recreated the Close button and invalidated countdown. Fixed redundant recreation and aligned notification clicks; failed evidence retained.",
|
||||
"static_api_trial": {
|
||||
"final_design": "Explicit QMessageBox object; no application event interception.",
|
||||
"rejected": "Static Qt question interception caused timer ownership/slot errors in experiments; rejected and replaced before final integration."
|
||||
},
|
||||
"default_timeout_ms": 3000,
|
||||
"defaults": {
|
||||
"submitted_verify_check_management_recovery": "confirm",
|
||||
"unknown_owner": "skip",
|
||||
"uncertain_pcb_readwrite": "skip",
|
||||
"version": "last_user_saved_if_enabled_else_cancel",
|
||||
"native_cancel": "confirm",
|
||||
"save_before_close": "save",
|
||||
"force_terminate": "cancel",
|
||||
"notification": "close"
|
||||
},
|
||||
"compileall_passed": true,
|
||||
"diff_check_passed": true,
|
||||
"independent_review": "Final read-only rereview found no remaining actionable issues.",
|
||||
"files_sha256": {
|
||||
"src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057",
|
||||
"src/cbb_refresh_verify/backup_recovery.py": "1d7ef08ef53ca7a0971cdacb0908d9bb06d067b06dc2329fa58722ce9068921d",
|
||||
"src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a",
|
||||
"src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35",
|
||||
"src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9",
|
||||
"src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3",
|
||||
"src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92",
|
||||
"src/cbb_refresh_verify/diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072",
|
||||
"src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b",
|
||||
"src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56",
|
||||
"src/cbb_refresh_verify/dialog_probe.py": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e",
|
||||
"src/cbb_refresh_verify/dialog_rules.py": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5",
|
||||
"src/cbb_refresh_verify/dialog_supervisor.py": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247",
|
||||
"src/cbb_refresh_verify/failed_session.py": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09",
|
||||
"src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98",
|
||||
"src/cbb_refresh_verify/icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03",
|
||||
"src/cbb_refresh_verify/icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360",
|
||||
"src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed",
|
||||
"src/cbb_refresh_verify/library_lock.py": "6836ec8ac21e788eb75326ff44cb31ad4bdfb5f381bd35cdf33e6b34c7fca89e",
|
||||
"src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195",
|
||||
"src/cbb_refresh_verify/library_reader.py": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438",
|
||||
"src/cbb_refresh_verify/maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990",
|
||||
"src/cbb_refresh_verify/management.py": "7ead9bfffeb44201e44f73d9f039590f091e9a456982f2110dca8ec3695f8803",
|
||||
"src/cbb_refresh_verify/management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0",
|
||||
"src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638",
|
||||
"src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116",
|
||||
"src/cbb_refresh_verify/models.py": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105",
|
||||
"src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94",
|
||||
"src/cbb_refresh_verify/native_backup.py": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d",
|
||||
"src/cbb_refresh_verify/native_engineering_identity.py": "8c0fc144707d68a9b85f6da50ef950f1f6e7fee248acbf34d19b707d51212be0",
|
||||
"src/cbb_refresh_verify/native_export_guard.py": "523cdf44db8e1665634feadba963ccf26777dc8942fb2eb604d2c30bbe92cbb6",
|
||||
"src/cbb_refresh_verify/native_management.py": "eb2ec311489eaf5deb06893a54a02469c9b2bb9baccbdd6563bae295aafcf363",
|
||||
"src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49",
|
||||
"src/cbb_refresh_verify/native_repair.py": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98",
|
||||
"src/cbb_refresh_verify/native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393",
|
||||
"src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f",
|
||||
"src/cbb_refresh_verify/operation_lifecycle.py": "3838c5a501711d16f578c45ebbc6f960872b0c3ba6bbda9a597f994ef746cef6",
|
||||
"src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f",
|
||||
"src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903",
|
||||
"src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5",
|
||||
"src/cbb_refresh_verify/pcb_open_consent.py": "fd56dfe0b537408745127d80ea68cc59d3f333954af76bac7a7b324d66badc65",
|
||||
"src/cbb_refresh_verify/pcb_restore_prompt.py": "a488ab48845173f463042c17ad1e719fe37a4bcf98a660f06453eef171b0e7bb",
|
||||
"src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4",
|
||||
"src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63",
|
||||
"src/cbb_refresh_verify/reimport_recovery.py": "ef148549751fa47518f5f2ca8f32ba25794ec5f22e0de545476ea33f89a3f0bf",
|
||||
"src/cbb_refresh_verify/residual_sessions.py": "4ac500b33b209611d54eb496c6c30727ba159742d625431ceea84471a5fc3442",
|
||||
"src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e",
|
||||
"src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367",
|
||||
"src/cbb_refresh_verify/scoped_manifest.py": "9318bf0f929d23c18466a25d83a4a9903822093c123aae10510061788c6d0ab7",
|
||||
"src/cbb_refresh_verify/session_record.py": "2bc3cff365008864584138a4ff13538bb6b2f90d981e7d008a1300f9102c6e7e",
|
||||
"src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196",
|
||||
"src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8",
|
||||
"src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2",
|
||||
"src/cbb_refresh_verify/verify_runner.py": "3027ef7fc1ef6365ff36ae0c83389d869b92ffcd96985d10275bca4dc9483e3f",
|
||||
"src/cbb_refresh_verify/write_admission.py": "c5f879bd5cb70a5dedfc64349c8758bf370daa4240491addd2aecd344f3a935c",
|
||||
"src/cbb_refresh_verify/__init__.py": "75942b10cc5c09f19d5f31bedd0395361642336f52bc9e9872d8483e3b9882f9",
|
||||
"src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0",
|
||||
"src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599",
|
||||
"src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "8a80f584347f3fdefc089169894712746fee85f079b029578f008d6aecec8d90",
|
||||
"src/cbb_refresh_verify/ui/icdb_check_task.py": "ade3bf414aa29b42f4c1535c613b2cacb2735f6abc7900e6da25999390a5891d",
|
||||
"src/cbb_refresh_verify/ui/main_window.py": "f72062cb3d97cbd38f6390b9483e0f3aab619dec0bb2292c02d32b7fc5cd84b9",
|
||||
"src/cbb_refresh_verify/ui/management_dialog.py": "57698f42112b120899dac26c40d2aafb4b5ba719660a302c0460361a7d50609a",
|
||||
"src/cbb_refresh_verify/ui/pcb_open_dialog.py": "1b9689d555d221567263b6b587250b51a11bef276c35d64393e1b3d13803c625",
|
||||
"src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "11479db5520310af37824e083cb678d69d4cfd12f70dcd29ccb906b929e3d9bd",
|
||||
"src/cbb_refresh_verify/ui/residual_release_dialog.py": "a0bdcc091778d508c43a6af96bd6423b25cd029c92b6bcff22d459d09a030d06",
|
||||
"src/cbb_refresh_verify/ui/timed_prompt.py": "71db65febd0aff9117dcee42dde5151a7f13a3337794c77031cf5585f0397d97",
|
||||
"src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888",
|
||||
"src/cbb_refresh_verify/ui/write_owner_dialog.py": "65dc3c8287f4ac5dc767797c13e192f6bd916f9051570a33a2b18f4f8334c3b3",
|
||||
"src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
|
||||
"tests/button_simulation.py": "3278868565853001103557d5f7ada42b11b05c03feb9032deed0327b6609de2b",
|
||||
"tests/test_abnormal_shutdown.py": "0abdeaf51e2ffc3f771e09aefa9ec647a72b7f64757c9f3851926fbd392cbbcd",
|
||||
"tests/test_all_buttons.py": "a075cfdf3223b754be351db54844f94a8538519c38a12b1b575ec483c544d57c",
|
||||
"tests/test_application.py": "bba12187fca6fee0f4f8862182bb40d939e2995016af2cdbb3fd756f6a99135d",
|
||||
"tests/test_automation_license.py": "45e9c75d0d3e1a76f997f7da4cc87b5eb1b05a4ea2356408725742eac8a09ffb",
|
||||
"tests/test_background_icdb.py": "df9bd9e8252e0dee4527dc6a740c0c33e76d1fb06a79b816cc15809d95716e44",
|
||||
"tests/test_background_queue_regressions.py": "132866bfccc9a7ac5cb234f97aaf6a290e2e4ef949f31e2f70b0f3eafeb99046",
|
||||
"tests/test_backup_recovery.py": "efd88c0c00440ac915b147c2e6dee8044ca805b03f90ab9f171cbde1db11cb9b",
|
||||
"tests/test_backup_recovery_dialog.py": "24a120e45dee151bc71a2e1a05345936c5063bf0f57a277af02ef3a6bfd753f9",
|
||||
"tests/test_batch_blockers.py": "4387293d3a5820fab630e3c5fe1b424f61ba6947773e5a61125d840433c5c62a",
|
||||
"tests/test_batch_item_yield.py": "ed4be6d1e854b18d054a75c92171cd46b6b64411c2f74e9a3caf31fba3c7366b",
|
||||
"tests/test_batch_status.py": "c1f9af0c7c6f3171b3726fb53346f480b13b8d9cd88111a9c12e2fae2392bbff",
|
||||
"tests/test_batch_status_faults.py": "314e890c9aee439c8a75b4dfd605685240c74f6212da975fd50526bd70b4a0ff",
|
||||
"tests/test_desktop_worker.py": "671d616f04a01d74508b328e3b6fc8f6c7191a91de0dcaa486aa98a3718353ff",
|
||||
"tests/test_diagnostic_open.py": "b44f8f7b171602ad2691ea2e064ac9fe94f2fabb9fcc2eb6760cc1dd365b9423",
|
||||
"tests/test_dialog_agent.py": "8c746e47d55637ca18d7cc998f324a0c2e0a5214dcfe8fcb6458c060619c211c",
|
||||
"tests/test_dialog_models.py": "6902cf5c292458340fb48241b34875e111a0113d706cd82775934a7f72bab7b9",
|
||||
"tests/test_dialog_probe.py": "55c98f6102957a27a96dcfd4f4bf3af499b5055225b77ef93b7b332dfd4ac472",
|
||||
"tests/test_dialog_rules.py": "96bf36493da770679e9207e96b3088ef7f471aea22e17c254f33326ffef0d7f9",
|
||||
"tests/test_dialog_startup_budget.py": "6f23c01836e4894ae82c3345a2383c4f8eb0517056c5b953c43100acd0fc3739",
|
||||
"tests/test_dialog_supervisor.py": "4c1b00050127a65b0a8cf1c7a94fd673431ea3f04b76033a463804d0468ad2d9",
|
||||
"tests/test_extended_safety.py": "7450816abba89aba1f4739f819f43631def82701fe07481279db2b3f3ed96cf6",
|
||||
"tests/test_external_owner_release.py": "675ddbab4a97e86febac3003b9083c259295534941aa0463488a5a1206cfaf92",
|
||||
"tests/test_failed_startup.py": "eca757ea46a4c0aa4fb0368ff53f26822af71612d251ecd87132686fe3c3794b",
|
||||
"tests/test_failure_lifecycle.py": "dfeac56744a44e6f4c7898516749ca478f53d7c7f08b3843a05ef7f448c469a7",
|
||||
"tests/test_icdb_address.py": "cbdc07e5043349c796a4ea1ce3d4989062094cd28929a9ef7d42c5ba75b77907",
|
||||
"tests/test_icdb_batch_check.py": "79b4a8d9576449bde64f06bfd4d30b82ce6fe93e055c238eb1f239e75b472579",
|
||||
"tests/test_icdb_open_check.py": "1f3750169755d0553bac3e0f8bec244038b84f9cd970e17c9f6eb67dee0e3dba",
|
||||
"tests/test_icdb_recovery.py": "298ddac4b79b4400efc99ff27c58ca49fffea1f401a31071451b2fdaca59036e",
|
||||
"tests/test_import_without_export_gate.py": "2f249412736cbe84f0c82db82403212739b7c53355f87cd053587ccdb722b175",
|
||||
"tests/test_incident_safety.py": "52f3ccb04db8971bf38628c2bd334d4fd79795e97de6538f6f66cb35f7123ece",
|
||||
"tests/test_independent_operations.py": "4ba5798df3346bce74c3703c158f1dce1d1ba14df748606fcaf900c8568753e0",
|
||||
"tests/test_integration.py": "9e9d30692607c889e1e3744a63c79c68e3af7d4c86804e0bcebe48e68765086c",
|
||||
"tests/test_late_release_continuation.py": "34c62a628cbc08f4e8b9a1919c13f17772a2d26d1996fae34a35f814725b00e2",
|
||||
"tests/test_library_lock.py": "3d65bd941faa441404045ce0140ea3ea5e58fb7d410b7b76bb9f03a9ea03d3af",
|
||||
"tests/test_library_reader.py": "b39a1dc9d99c2463b744141e3c3489cd49ac4a637e7835559a9c3fe9cbafbb58",
|
||||
"tests/test_lifecycle_supervision.py": "cfe29f1e73c6ef38d11e185e211b6e2fb60247f53a44e99dd1e2f8cf7a009faa",
|
||||
"tests/test_maintenance_diagnosis.py": "0849aef555475a03b061eacf499f261fb75f2e727f35dba3cbceafac92e2a638",
|
||||
"tests/test_maintenance_entry.py": "5ed3cda8e0c829fb2964e27f1bdc6fa8ee8dcde93ec63338959bf754b62d6a0b",
|
||||
"tests/test_maintenance_owner_scope.py": "7cf64dc7f2b126684dcac6e619cbd87eca3d85ec2fc1f70f057154679dad6026",
|
||||
"tests/test_maintenance_review.py": "ba807fd8c25c1b52cf2443d8bcf2f57539819715c0bc6c358d31d8542c2e7ce5",
|
||||
"tests/test_maintenance_startup_gate.py": "4f69d33218483a658b51b2012ae8bfa83aff8a787152a38b19dadc4c0d3ffe36",
|
||||
"tests/test_maintenance_ui.py": "9c604714b0742503dbd55b243161a01f4ae62fa0cae7c4cddec7a2b8c81d07ab",
|
||||
"tests/test_management.py": "cad0fb43eca9e7022a33a5e9ff0a408465b262fd304b146cdc85c28265f2e74f",
|
||||
"tests/test_management_diagnostics.py": "671a9d7c112ededbee332db9b6fbab786fb37e9367d992f902f3ab2c9f60880b",
|
||||
"tests/test_management_native_transaction.py": "7ca227aae6426c4d0d998edfd8620ec18905aaf212f0be20ceba97b1cde3a9a4",
|
||||
"tests/test_management_probe_guards.py": "ae9be3dbd7c6a616478b7d4ea3498c428ff94a985089fe798463c5cab456f151",
|
||||
"tests/test_management_retry_blockers.py": "124dbef291dbe331ba0c3e7de1665c910ea43e37b1563429b387f0f2233953ee",
|
||||
"tests/test_management_source.py": "16e608ed9c8b0aa81cf08d49f165a33a1403c4ea7f2a5be44e8cfc8cb49850ad",
|
||||
"tests/test_management_supervision.py": "2dcadd6551a94c52e5d4e74285959f10144a89c48af87e508abaea945652d1f6",
|
||||
"tests/test_management_ui.py": "3d02dd00f20227aba6eeff40b9c49e34c93f81b02a02370fb0fa6848a1981413",
|
||||
"tests/test_manual_backup_ui.py": "c1d3f7363a18ad3a690854d503199aa703c0a11ef937c933b025fd9b98083ed7",
|
||||
"tests/test_mentor_paths.py": "a05a91812a74b58e76f36d581216ee43969d2576b8a8e7d1cde3e301c52cf4c1",
|
||||
"tests/test_native_add_failures.py": "ceedd60e030628b1af149d08d16216d5f7158a63686729bb357c148da86fb0ec",
|
||||
"tests/test_native_backup.py": "43ec0c6b14b53864553feaf5d9fb498b37866f24edc486c0749160d3f803db5f",
|
||||
"tests/test_native_engineering_identity.py": "a1adcf6883a9b55c2c37d9f491faf40dd4928f4d8db675419fd288dd31552c69",
|
||||
"tests/test_native_export_guard.py": "f8ec4fa1058af55008e9628f79f2dc70b6e551f36815a812d10bfdf955cada51",
|
||||
"tests/test_native_inspection_release_regressions.py": "8f7bb0b2b641d437872f1dd1d0c2547c2522c81e3c0351c31a7125f751d91927",
|
||||
"tests/test_native_management.py": "badf33d4d00104c7e96e336777fb3e49690cc9db5ce1b071f98520aa5b6668f1",
|
||||
"tests/test_native_management_fields.py": "9917ca0910e19bd809c86d0120c652145261528ace33c3b805f5663442c4a973",
|
||||
"tests/test_native_occupancy.py": "56293dbe24bd3cd4f74cf8208e933faab7d737e5a5684a5d38838d063c3aef6d",
|
||||
"tests/test_native_repair.py": "113185ced72d8f4f4eafca99054d97fe80a504d1c6cc91aaf86f55cea1b7e138",
|
||||
"tests/test_navigation_tabs.py": "d7d5bbfc752f73c1b1d4615ffafc1266e772d96f3f3ba3d82c4b4baf678b292d",
|
||||
"tests/test_network_path.py": "f52624391ae78e9b913dace2b1a9a2875a5855f86dc9e12c324ef493e6c7817b",
|
||||
"tests/test_network_release_safety.py": "caef536d0a40b2eb848c1b8ab095ab374af247c03dd44acf8a70f0f500db6dac",
|
||||
"tests/test_operation_lifecycle.py": "c0ce6c86b73021a8b162ae9e67a10aeec8a27a98e382fd82e1449a451a9a8c3c",
|
||||
"tests/test_operation_queue.py": "8137528603f015695ed4d60a0c8fa8e7bf0a1c4659f8dc2a181291f5d500e6a1",
|
||||
"tests/test_owner_probe.py": "deb757e022980f11ef48e57a2fd002ee3e90ec647a4666a0c4d4427313b6f725",
|
||||
"tests/test_packaging.py": "87a6d04419775c0c5c806e0e569a48d7ef199a0bff8736b211443a1f471e7e8a",
|
||||
"tests/test_packaging_status_bridge.py": "cbfaeac070a1494a1d8609fc25e9a779a63354c8914b4c6c57fdc7c31b70d472",
|
||||
"tests/test_pcb_bridge.py": "527fb63147a203a2e9419da989aff600d3e461580989e39e8ede3a8cc57b901a",
|
||||
"tests/test_pcb_open_consent.py": "ec94b5b73790d7e0caf7140783e73e4a32a21b787f80a427e96fc7083f33535a",
|
||||
"tests/test_pcb_restore_prompt.py": "a005691d0296587e520e20c4430e9e55227d767c8e910e950a9f2e93aeccb2c7",
|
||||
"tests/test_pcb_version_choice.py": "0825c28333e4ed4f5a63847b6f5bb11143e922c7203d2770ce9c78fc8edec20f",
|
||||
"tests/test_post_repair_consent.py": "bf417b378255386dc97ad8efdf5003b0691aa5d69da9d9256aa367dc16a2d4bb",
|
||||
"tests/test_post_verify_diagnostics.py": "212857e56581998a3a3cd53635030b68a089fc4d630a8b0ee7ef3f137090dcc4",
|
||||
"tests/test_private_desktop_discovery.py": "5361493313ae6864e252cdb9f2c72e71b39264a1c022beb4cf0c04c143cdd91e",
|
||||
"tests/test_readonly_status_policy.py": "3ed40d7bdf2d3e6f70b38803b89a8b982336556444b45c6ba6b0a7c6df52a97f",
|
||||
"tests/test_reimport_recovery.py": "2c0ecf52cd6c393f572c11b5d998a78ef538f7a277668cdc329a03e267074650",
|
||||
"tests/test_residual_release_dialog.py": "1d5efa03cfe013770e2b81e1fcfb669142f5d6a07957110e56a3cc5eeb57c4a3",
|
||||
"tests/test_residual_sessions.py": "2c51ed1dc95a3afa7ebb24027963dfa9d13aba9c407e508e22ccc6e9f762dfeb",
|
||||
"tests/test_review313_residual_isolation.py": "52a8024ed4e2a7fed219fe46cacdf76fa971166feedd557206716ef7f6d3c914",
|
||||
"tests/test_review326_dispatch_and_receipts.py": "ce4d529246da1c4d53c3dec70ef49542165064404301dec3e32851df62492ecf",
|
||||
"tests/test_review326_queue_guidance.py": "305662f79251669685a618bdd35d524ef2b37eaece4428bb58ae4c5b65abb8ac",
|
||||
"tests/test_review345_ui_cli.py": "795e7e4f9bda8874c6a65a08863cab19f4adb3412287276ee2960588f0fd2fa8",
|
||||
"tests/test_review348_release_comparison.py": "ceccdb3d6f7bc6cb65562c059f13aa2bc5d89d98c6f64b0f11d9b943ebbde165",
|
||||
"tests/test_review381_queue_release.py": "e0d62424cbf70ec9573db78ede0a4c6534775399194eed4c6b28ba8d468307be",
|
||||
"tests/test_review391.py": "304d46d63af87ea4a9bca83834b77cc44c5c9addf7b0f3752431304ee612568c",
|
||||
"tests/test_review414_export_and_audit.py": "ec785c2656bed97de6c8467885f2ad0877b55ee872b02928744d399e8767d8a0",
|
||||
"tests/test_review414_open_and_queue.py": "db065207dacaccd0bd80af52c1f1edaf36a278e7cf2dce7c9b44bc51dd0e1cec",
|
||||
"tests/test_review414_write_admission.py": "732a3683c2e27331cd5a9645e062e22613f848cac1a12745744fe249b48a9ffe",
|
||||
"tests/test_review430.py": "7350f3883ddb9be48cc66fa7b0f612e1b45acf2298c80a7faa3da1f05d6d4c83",
|
||||
"tests/test_review_319.py": "831fd34d426abb4436b9132bfb7ed754994155a34ac60a59378dee0964b54d28",
|
||||
"tests/test_review_backend_followup.py": "2f3f51a72ecd05fc33c6b5a8dddaecfd12d2b50df423c87b4c18d1e52b2609bd",
|
||||
"tests/test_review_foreign_release_evidence.py": "cbf2af02418f6bd3ec720a7a7658cf97f06d1a6e12009fdff2a99f465711591e",
|
||||
"tests/test_review_management_ui_followup.py": "746602a84c3ba9cb041c5dd354b39d344355b71a3666b27a47eb9aee231e171c",
|
||||
"tests/test_review_release_followup.py": "8779bde7aaaf59ecf362990afe1d9e7ed4ecb1f6fd7653c08bffbdc296200837",
|
||||
"tests/test_runtime_timing.py": "7152cd8fedfe165e769dadc1238c347d9f4d3e93cd57f6ed991e14d959e720f7",
|
||||
"tests/test_safety.py": "ccf5febaf0a974d5e5357398a6946d3f121e07a6247c2f0dc5b71d86b39cac52",
|
||||
"tests/test_save_helper_identity.py": "178a68c4a9a8c618dad3d8393e816dd1d2a16aef8d1fb9984117fe9dc8d06add",
|
||||
"tests/test_save_helper_runtime.py": "00b092ec799da4bca424e1ee63a83bee783c81dbcdc20b7526fda8b45bb4b72a",
|
||||
"tests/test_scan_isolation.py": "cab02bfe55ed515f889d3fcba6e6880344f482cc3a78a072b543b7a871cf92ab",
|
||||
"tests/test_scoped_manifest.py": "fe9b2047d2c43812e851dd89ff250a2e5907dda89b3f5d9ae0a4dc4c5f452eac",
|
||||
"tests/test_session_record.py": "6b51b19adfb232275195da7ff1ba91a5ce5e296f9424a7a1a29fc67ecfdfb108",
|
||||
"tests/test_status_bridge.py": "fe1c0632d4d5fd5a1caf221903d4cfe38eda62aaa4298e3438735e31b8459ab2",
|
||||
"tests/test_status_bridge_server.py": "7d8cd72d69afae0f96ebbd9bb3be2ae3c222f01108e45ab51a09e54d4d8527cc",
|
||||
"tests/test_ui.py": "ec0aad6d58b81a42129709b4cbeda9e754be48c6107a5b12384f75170c983463",
|
||||
"tests/test_ui_batch_safety.py": "12a8d82d4aedbeee315a02a49ec0e9888547ad4abd63e181e7f392b2a39e26dc",
|
||||
"tests/test_ui_filters.py": "d542e3d6fbc8cff64229b31ea8d0ed14ae0fe0c2c03b6a6eefed2f57dfbe77c9",
|
||||
"tests/test_ui_lease_lifecycle.py": "18ea8af868373fa795a4911754be55068fe75833ce35579c1212fd7f4713f149",
|
||||
"tests/test_unattended_prompts.py": "9dff94c678af95b796dfc068bb478de720547dad0b341a63195ca97710f2c4af",
|
||||
"tests/test_verify_diagnostics.py": "b6431194e9f4c86a42110cac0d5f712c27b063f43b4ce820327aded81602908c",
|
||||
"tests/test_verify_probe.py": "aeb65b5bd2df14e8a8f3ba5501855b5946e6f8a22f0d26960c00ff1b0daea56b",
|
||||
"tests/test_verify_runner.py": "e58619f55873302c39129ce50e50fb25173a96ab309d975aa4f47f0bd3459fbb",
|
||||
"tests/test_verify_worker_stability.py": "eae03400c2e3c8a0bc339c8dc05d890403c6bfb4c6d70d0361bc1b882b47d618",
|
||||
"tests/support/runtime_lifecycle_frozen_boundaries.py": "bf98533a1c06ccf4453d20b3804323779719e697141b8dc64fa679960a979cfd",
|
||||
"tests/support/runtime_lifecycle_frozen_fixture.py": "b87761c06a300f0d93bce864d3d31e045f2135324b2a9a42f8682ccbff09ad22",
|
||||
"tests/support/runtime_lifecycle_frozen_smoke.py": "65b530d1e18b35918595eddc7cedeb31ff204cc785b1dc3c0d8c0b87f4aba0a5"
|
||||
},
|
||||
"production_logs_read": false,
|
||||
"mentor_started": false,
|
||||
"production_library_modified": false,
|
||||
"published": false,
|
||||
"automatic_icdb_repair": false,
|
||||
"limits": [
|
||||
"Only confirmation-message waiting is changed; global busy/queue/I-O locking design remains unresolved.",
|
||||
"Native write, real occupancy and exact process/window checks still govern continuation.",
|
||||
"Native Mentor unattended end-to-end, Windows 10 and cross-machine SMB not accepted.",
|
||||
"File selection and configuration forms require valid input; unknown native prompts are not guessed."
|
||||
]
|
||||
}
|
||||
@@ -1,47 +0,0 @@
|
||||
# 无人值守弹窗默认动作
|
||||
|
||||
从 beta.3 主分支 `e4875b4` 开始的本地修改。此记录不是云端发布公告。
|
||||
|
||||
## 之前修复为何仍有阻塞
|
||||
|
||||
此前以局部失败案例逐处增加保护,未完整验证各层的组合。界面 busy、原生队列、库租约、历史检查点和会话释放共同决定能否继续;释放动作还可能等待被阻塞的同一队列。
|
||||
“发生错误”“本任务仍占资源”“外部占用”“界面正在执行”几种状态未充分分开,导致恢复入口也被保护条件禁用。
|
||||
单项失败后继续的用例通过,只覆盖了可返回的失败;没有覆盖首次读库带锁、取消、换库、释放及关闭的完整闭环。
|
||||
|
||||
本轮只消除确认弹窗无限等待,并给出明确默认动作;全局队列及锁的结构问题仍需单独修复。
|
||||
|
||||
## 默认动作
|
||||
|
||||
所有下列消息框显示倒计时,在可见且无人选择时 3 秒后执行指定默认动作。
|
||||
手动选择、关闭窗口会停止本轮倒计时;不会在窗口消失后执行旧操作。
|
||||
|
||||
| 场景 | 默认动作 |
|
||||
| --- | --- |
|
||||
| 已点击执行的普通校验、ICDB 批量检查 | 确认开始 |
|
||||
| 已预览并提交的新增、替换、移除 | 确认执行;原有逐项检查及人工备份提示仍在 |
|
||||
| 已选择完整来源的备份恢复确认 | 确认执行;副本验证及安装前检查仍在 |
|
||||
| 已明确请求的原生取消 | 确认发出原生取消请求 |
|
||||
| 已进入释放流程的“关闭前保存” | 保存后关闭;不默认放弃未保存内容 |
|
||||
| 未知原生客户端占用确认 | 跳过本项,不给未知客户端授予写入许可,不取消整批 |
|
||||
| PCB 提示上次未正常关闭或仍被占用 | 跳过本项;实际释放成功后才能执行下一项 |
|
||||
| 原生历史版本选择 | 沿用用户此前明确偏好的“最后手动保存”;该候选不可用时取消本项,不改选自动保存 |
|
||||
| 强制结束客户端 | 取消,不自动强杀 |
|
||||
| 结果通知、原生详情通知 | 关闭;记录仍保留 |
|
||||
|
||||
选文件及填写来源等配置窗口需要有效输入,不猜测工程路径。
|
||||
未识别的原生弹窗不猜按钮,也不使用鼠标前台抢占。
|
||||
|
||||
## 证据与边界
|
||||
|
||||
OpenChoice / RestoreChoice 保留一次选择,新增 `decision_origin=user/timeout_default`;原生 PCB 选择记录与动作载荷写明来源。
|
||||
未知客户端超时默认跳过,不生成“用户已确认无人使用”的许可;逐项结果保留超时原因。
|
||||
所有原生身份、窗口按钮、地址记录、文件占用、保存和释放证明照常执行。
|
||||
倒计时不会解除真实资源占用,也不代表 ICDB 已修复或工程 READY。
|
||||
|
||||
测试包括实际等待 3 秒、人工提前改选、首选版本不可用、窗口隐藏/关闭后计时失效、一次性决策以及选择来源。
|
||||
测试不使用生产日志,不启动生产 Mentor 工程。
|
||||
|
||||
最终全量 1937 项、逐按钮及弹窗集成 100 项通过,编译及差异检查通过。
|
||||
首轮全量发现通知框重复创建标准按钮导致计时对象失效,已删除重复创建;首轮失败证据保留。
|
||||
完整散列和测试记录见 `2026-11-16-unattended-prompts-validation.json`。
|
||||
当前仅本地源码提交,没有重新冻结、推送或更新生产发布包。
|
||||
@@ -1,132 +0,0 @@
|
||||
# Issue 15 acceptance matrix
|
||||
|
||||
Refs #15. The final grouped review wave is implemented at `c1e2596` (B14). The complete suite passed **2,418 tests in 594.83 seconds**, actual exit code 0, with zero failures, errors or skips. Actual B13 ordinary Verify/Stop with automatic candidate-owned cleanup and cross-owner queued Versions passed; actual B13 CBB recovery passed source and target verification. B14 preserves explicit ordinary release promotion of an existing cold observer; that narrow change has source/real-process coverage and updated frozen checks. Native cases retain B13 identities. The final scoped independent review passed for 32dcd80..8869093: I1-I3 addressed; zero Critical/Important/Minor findings. This is a technical review, not field acceptance or merge/release approval.
|
||||
|
||||
## Executable bindings
|
||||
|
||||
Each case retains its actual executable hash. Rebuilds checked all packaged modules/resources and repeated the affected operation plus common frozen smoke; earlier passes are not relabelled as tests of the newest executable.
|
||||
|
||||
| Build | Code commit | Executable SHA-256 |
|
||||
|---|---|---|
|
||||
| B1 | eaff46e | `24201dac278ea91fbc7f1b50146a10e024d4c4bf0da14ec5ecbeedbac65104a0` |
|
||||
| B2 | fd50805 | `a75414653a399cfc76633cad25544d57749ab5a8b49ef227d0a0833f8828257f` |
|
||||
| B3 | e0bb243 | `aae0039bfcdcb21ea3d25156920a4124a510a10ac499049604550eddc2ab7645` |
|
||||
| B4 | de81bbf | `f87e403ee5a4891cff82649f5fef573cd304e5052aa3954faaaf43fd94b2ae88` |
|
||||
| B5 | 4402486 | `b52b8689dc66cfccbf94d578a23de3021fc6857933d9bea38b77038c3711d721` |
|
||||
| B6 | d5d1a3d | `f60e2eef44462f590ad81c94c0d2479cd017d519a7e176b34ee45258aae14690` |
|
||||
| B7 | 845ae58 | `dcdcd33e7909c8d1d3b616ef722734f630ea2f793e7bd162e7e8e722978baf9b` |
|
||||
| B8 | 7cc65f7 | `e1ba9e057d8147fcf451dd419d63660d507a29c96402b174f8824ed6a8ec159d` |
|
||||
| B9 | a3f69de | `bfd6c122724f71a2aac4748ed01336a9949aa753f9c58aca55db574668140083` |
|
||||
| B10 | 701e5cd | `a6271e4219a02123e301ed1e0ea3109e78307bf1f92574b4a5cacb70690695a4` |
|
||||
| B11 | 8818fa9 | `03452e39f394c3c63113aaa701f64bacf14e817ae3b4e194965f333ecc645b98` |
|
||||
| B12 | 906cfc0 | `7d7929d6621ae6c379205380e06f94eb076135343417d000018a8ab04efea8cc` |
|
||||
| B13 | 5e9509e | `966e00fe57eccbdf4975c624026d39d24d4613f4174a932db248fb444a7caa9d` |
|
||||
| B14 | c1e2596 | `0cd5f37b113802bcf3abd07a94d8c5b9f73d40696b1c56af66fedf39112e2d8c` |
|
||||
|
||||
B9 ZIP SHA-256: `4c589bae6bf7b68732cd7ebe373b2924016c71f6731fd661c1cd0fd848427438`. All 68 packaged modules and required assets/scripts/bridges/icons match the source; all 242 extracted files match the build. Its five pre-cancelled worker entry routes and common GUI/worker/owner-probe/dialog-agent smoke passed without launching Mentor. B8 is separately archived with ZIP SHA-256 `795010cc0b54b995eced859cac1513bf105092e484a44b1231955801deed879f`; B5 retains ZIP SHA-256 `176c7cda89c2a2706f969fa6dca513d2760615491aaf70c19fe7a0688abe471a`.
|
||||
|
||||
B10 ZIP SHA-256: `d4bd42416ea8d12a249ff1d9c8854eb76d2f81bb7ff869ff43dd92a331c647a0`; 68 modules/resources and 242 extracted files match, five pre-cancelled entries and common smoke passed. Only the residual-session module changed from B9. Earlier actual cases retain their original hashes.
|
||||
|
||||
B11 ZIP SHA-256: `34b3646b27afae22ec43a415ca19bbd32a91c0a4c941d37d6289c76cea9ca730`; the same module/resource/file checks, five cancelled entries and common smoke passed. Its only source-module change from B10 records each acknowledged Tip per cleanup intent. Immediate/delayed Tip states with/without prior Close passed focused source tests; no new actual Mentor Tip replay is claimed. The harmless real Win32 adapter probe belongs to the B10 source stage; its unchanged adapter preserves hidden MDI siblings and sends no action with an extra document.
|
||||
|
||||
B14 ZIP SHA-256: `a580e3e9945261761e0eb3968b4e271d9f4745ce982dea96c283af4ab06e565f`; 68 modules/resources, 242 extracted files, five cancelled entries and common smoke passed. B13 actual native cases retain their original hashes. B12 failed late ordinary cancellation remains archived with its exact identity.
|
||||
|
||||
## Reported issues A–H
|
||||
|
||||
| Issue | Source verification | Actual frozen evidence and limits |
|
||||
|---|---|---|
|
||||
| A: cancellation leaves startup prompts/clients | Exact ownership, known prompts, cooperative cancellation, admission and shutdown coverage; late Tip after first Close, held identity, delayed launcher, no second Close, unknown/document/progress/write negatives; single legacy release intent and observer proof. | **REPRODUCED on B5:** Stop 0.797 s after registered PCB startup returned CANCELLED/safe=false with a late Tip and retained PCB/launcher. Manual Tip OK alone completed the existing close; that remains a failure. B8/B9 automatic release and B9 one-confirmation legacy release passed separately, as detailed below. |
|
||||
| B: another project's address blocks release | Scoped resources, exclusive Windows handles, fresh proofs and independent-item continuation. | B5 Release UI confirms zero active sessions and released library ownership. Earlier metadata handoffs and a separate bounded file-probe timeout remain failures; no native lock/address was manually deleted. |
|
||||
| C: Versions conflicts with the parent's lease | Parent/child handoff, worker admission and reopening tests. | B1 official Repair, manual backup, exact-version restore, backup verification and reopening succeeded on the selected copied project. Tool exit alone was not counted as successful repair/restore. |
|
||||
| D: historical records block unrelated/retried work | Legacy evidence is rechecked; a new confirmed operation requires fresh scoped release proof. | B3 corrected 8212 update succeeded in the same data root after the earlier failed operation. The original failed journal remained unchanged; later recovery and B operations continued. |
|
||||
| E: optional LM dispatch returns without starting PCB | Bounded dispatch observation, exact target binding and owned-LM cleanup. | The direct native route passed. The exact optional-LM dispatch failure is **NOT REPRODUCED**; Windows 10 is **NOT RUN**. |
|
||||
| F: Save finishes but library remains pending | Unique project/PCB binding, reference alignment and authoritative READY gate; Save/Close/exit/release are distinct. | B2 B-control first Verify remained PENDING and correctly failed; one explicit retry passed GREEN. B3 recovered 8212 source and installed target both passed GREEN. First-pass noncommit cause remains unconfirmed. |
|
||||
| G: copied database is inconsistent | Diagnostic routing, manual recovery entry and error precedence; automatic Repair stays disabled. | B1 healthy-control Repair passed. Original complete fault-bearing field snapshot is unavailable: **NOT REPRODUCED**. Constructed-copy result is reported separately below. |
|
||||
| H: selection/input/results/confirmation gaps | Real Qt controls, immutable requests, stale-view protection, one-shot defaults and large-table filters. | B1 basic controls/Add, B2 wrong-source rejection and concurrent view changes, B3 stop-after-current/recovery/removal/reimport, B4 restart without replay, and B5 diagnostic handoff/Release were exercised. Conditional controls are identified below. |
|
||||
|
||||
## Important native receipts
|
||||
|
||||
These identifiers locate retained local evidence; raw field files, private machine/user identifiers and production paths are not published.
|
||||
|
||||
| Build / operation | Receipt | Observed result |
|
||||
|---|---|---|
|
||||
| B1 duplicate A then independent B Add | management-c74c9a2b226e4df382be1447d2c9da95; management-4174be063d7843c69406e6610b4cc084 | Duplicate safely rejected; B UPLOADED with native registration/project/top/Layout confirmed. |
|
||||
| B1 manual Repair / backup / restore / verify | native-backup-ed65d2630b3c | Actual native success output; uniquely described archive and restore location checked. Archive SHA-256 `429195ff63fd76e3586a348357009e4638c06d2d2c27c38e5cdee63f6966d26a`. |
|
||||
| B1 Versions reopen | native-backup-de1ef77062a4 | Correct project/backup catalog; normal exit and release. |
|
||||
| B2 fresh-source diagnostic with external observation | icdb-check-455c02cfba8f / verify-d67aa6df8758 | CHECKED/safe; 261 read-only snapshots show Forward Annotation prompt disappearing and loading progress ending before Close. No manual native action. |
|
||||
| B2 B ordinary Verify | verify-491e77340ae2; verify-742c401bec4f | First FAIL/PENDING despite completed Save/Close/release; separate explicit retry PASS/GREEN with reusable-cell save confirmation. |
|
||||
| B3 8212 update and actual stop during Add | management-78e5a9b3f24b4353b778a540c6f67e56 | Stop clicked during exact registered LM NATIVE_CALL. Current item completed Add, authoritative readback and release: UPLOADED/safe. |
|
||||
| B3 CBB backup recovery | backup-restore-4c7aad5bd125 | Source verify-2c4769255397 and target verify-adad45363659 both PASS/GREEN; installed=true; old Work retained; both COMMITTED/CLOSED/EXITED/RELEASED. |
|
||||
| B3 B remove and reimport | management-c156db77b0c449a0b0e034891aeaacff; management-15a95455d14541e4a47a3b4b2126c8a7 | REMOVED with authoritative catalog absence, then UPLOADED from the independent source. Auto-verify off. |
|
||||
| B4 restart | restart-before-06 / restart-after-06 | Operation-root sets unchanged and no native process before explicit Read: no automatic replay. |
|
||||
| B5 diagnostic intent/ack/Close | icdb-check-8683e232ce83 / verify-755f3af6b650 | CHECKED/safe, 38.437 s; exact intent/ack/Close identity and nonce match; intent precedes Close by 0.125 s. |
|
||||
| B5 explicit Release | sessions-e4c27855ec69 | UI and durable RELEASE_CONFIRMED agree; zero active sessions, 7.704 s. Exact file-probe helper returned HELD and exited normally; read-only observation sent no target control action. |
|
||||
| B5 early native Stop — original failure | icdb-check-63f7ee04d30b / verify-719b874e0aaf | Actual Stop 0.797 s after PCB registration, before loaded readiness: CANCELLED at PCB_STARTING, 31.875 s, safe=false, native clients retained. 894 read-only snapshots showed the late Tip. Manual exact Tip OK allowed both clients to exit with no further Close, Save, annotation or force action. |
|
||||
| B6 early native Stop — loaded-target transition | icdb-check-762d0b790c2c / verify-67752f3332dd | Stop 0.813 s after PCB registration: Tip was automatically dismissed before any Close; target then loaded and showed Forward Annotation. CANCELLED/safe=false, 31.625 s; 892 read-only snapshots. Manual exact Forward No, then one normal target Close after progress ended, exited both clients without Save/annotation/force. This failure prompted the bounded cancelled-diagnostic loaded-target cleanup. |
|
||||
| B7 late exit after bounded cleanup | icdb-check-ac97c21a1863 / verify-0a4f641d37d3; sessions-98a1beebfb10 | Automatic one Close and late Tip dismissal; native exit followed the original deadline. Original CANCELLED/safe=false remained. A later manual Release obtained fresh proof, so this did not establish automatic observer release. |
|
||||
| B8 automatic cancellation and prequeued Versions | icdb-check-64348b7f55c5 / verify-505a4f09d4e7; native-backup-073e59195f9b | Versions queued after PCB registration and before Stop; UI terminal 7.125 s. Automatic Tip/Forward No/one Close, natural exit, existing observer RELEASE_CONFIRMED. Queued native client created 2.075 s after proof and catalog loaded. No Release click/manual diagnostic native action; original CANCELLED/safe=false retained. |
|
||||
| B5-to-B8 legacy release — incomplete workflow | icdb-check-17661d31889d / verify-4b7bc47b39f8; sessions-12c1715f5d7f, sessions-38ed41c344f8, sessions-2cca647d90da | Initial inspection handed off before a plan; Recheck succeeded. First confirmation declined Forward but did not close; second closed PCB/launcher while server remained; third obtained fresh proof. No manual native action, but multiple confirmations were required: not accepted as the intended final workflow. |
|
||||
| B9 automatic cancellation and prequeued Versions | icdb-check-b05147dc18bc / verify-3abaddb3e141; native-backup-005da267ebfe | Versions queued before Stop/handoff; UI terminal 6.672 s. Automatic Tip/Forward No/one Close; 307 read-only snapshots and kernel exit. Existing observer obtained fresh library RELEASE_CONFIRMED; queued native client created 1.684 s later and catalog loaded. Zero Release clicks/manual diagnostic native actions. Original CANCELLED/safe=false retained; backend duration 12.829 s is distinct from UI timing. |
|
||||
| B5-to-B9 legacy release — one confirmation | icdb-check-378044ad1122 / verify-d2acda2739c2; sessions-a5a9fe06b7c1 | Real B5 retained loaded target/Forward; old app normally exited. B9 initial inspection succeeded, one normal Confirm, zero Recheck/second confirmation/manual native actions. Forward disappeared after 3.562 s; 210 read-only snapshots show kernel exit. PCB, launcher and server RELEASED, fresh RELEASE_CONFIRMED at 22.634 s; UI agreed and Confirm disabled. Existing cold observer RELEASED; original cancellation result retained. |
|
||||
| B10 I3 setup — second pending item | management-f25df6a207ca4744ab4a0c23ddabb06c | Legitimate exact-name update from the existing healthy source, auto-verify off; UPLOADED/safe, native catalog/readback. Prepared two pending items without fabricated native failure. Selection made before final refresh was cleared; disabled Verify rejected the harness click; reselection afterward succeeded. |
|
||||
| B10 ordinary Stop — historical failure | verify-e464474b7bab; batch-20261117-105152-c3e162 | Actual Stop 0.547 s after PCB registration, no Save evidence: first CANCELLED/safe=false, 29.766 s; second SKIPPED with no native job. Later loaded Forward remained. Exact manual No, no-modal/no-progress check and one normal Close required; sessions-4aadbacb8a93 then fresh release. Not unattended PASS; ordinary cleanup does not have diagnostic-only authority. |
|
||||
| B10 actual Continue, no replay | button-watch-1794884270925407000; verify-f673ac48f600 | Existing summary's three-second Close elapsed before inspection. After main-window Release proof and normal dialog close, production code recreated Continue. Actual button click started only the previously skipped second item, which passed GREEN/safe. First terminal result predates the click and no first-item job was replayed. No in-process method/result injection. |
|
||||
| B10 actual result Release | button-watch-1794884430968047900; verify-4f959f61fbc4 | One bounded same-scenario timing repeat caught actual result Release and opened its residual plan. Ordinary Stop again retained Forward, 32.844 s; this remains a failure. Exact manual No/normal Close, no Save/force; sessions-6bfdf0a26476 fresh release. |
|
||||
| B5-to-B10 affected legacy release | icdb-check-92a3c92f6d6c / verify-9f3856153c79; sessions-82cc60b6eacb | Initial inspection succeeded; one Confirm, zero Recheck/manual native actions. Forward disappeared +6.5 s; 278 read-only samples/kernel exit. Intermediate PARTIAL then fresh RELEASE_CONFIRMED +35.387 s under the same intent; all three clients and existing observer RELEASED, UI agreed. Original CANCELLED/safe=false preserved. Entry was loaded Forward; actual Tip replay is not claimed. |
|
||||
| B12 ordinary Stop — late loaded failure | verify-642171759614 | UI terminal 7.797 s; loaded Forward at 34.406 s after original cleanup deadline. Manual exact No/normal Close required. Failed-run cleanup only; original CANCELLED/safe=false preserved. |
|
||||
| B13 ordinary Stop / cross-owner queue | verify-71aee0603183; native-backup-b63e7f708fd5 | Actual candidate worker No/one Close before first 30 s deadline; late kernel exit and fresh candidate/independent proofs. UI terminal 7.375 s; real Versions creation 5.220 s after candidate proof and 1.506 s after independent proof, catalog loaded. No Release/manual ordinary native action. Retained-phase No/Close branch not replayed in Mentor. |
|
||||
| B13 CBB backup recovery | backup-restore-3f98efb14448; source verify-06c8149375e6; target verify-f902921f2440 | Both PASS/GREEN/safe and COMMITTED/CLOSED/EXITED/RELEASED, installed=true; old Work retained, all 366 original source files unchanged, no native intervention. |
|
||||
|
||||
The B2 diagnostic run supports the implemented sole-handler No sequence through observed windows and verified code; there is no separate startup button acknowledgement event. The hidden-owner-chain save branch did not recur on corrected native runs and remains covered by regression tests plus the original captured chain. The original failed diagnostic required manual cleanup and a native crash acknowledgement; that crash was **NOT REPRODUCED** in the subsequent bounded runs.
|
||||
|
||||
## Buttons and misuse scenarios
|
||||
|
||||
| Controls / scenario | Source coverage | Frozen coverage |
|
||||
|---|---|---|
|
||||
| Tabs, advanced options, optional LM checkbox, runtime log toggle | Actual source UI and Qt tests | B1 actual navigation/toggles. |
|
||||
| Library chooser Open/Cancel and Read CBB | Actual chooser/catalog; invalid-input tests | B1 chooser cancellation and catalog; B3 removal/reimport catalog; B4/B5 explicit reload. |
|
||||
| Select visible, Clear, filter/hidden selection | Actual UI and 381/3,000-row Qt checks | B1/B2 actual controls and view changes; immutable original operation retained. |
|
||||
| Verify selected / visible non-READY | Actual source native verification and Qt admission | B2 ordinary Verify; B3/B13 recovery target verification; B13 actual ordinary Stop and automatic release. READY exclusion remains enforced. |
|
||||
| ICDB batch confirmation No/Yes and stop | Actual source checks; Qt stop/continuation | B1/B2 confirmation cancellation and diagnostic runs; B5 acknowledged close; B8/B9 actual startup Stop and automatic queued continuation. Other cancellation timing remains conditional. |
|
||||
| Manual Repair Cancel/Confirm | Actual native healthy control | B1 native diagnostics/defragmentation; not field-fault recovery proof. |
|
||||
| Versions / create backup / restore Cancel/Confirm / verify / Close/reopen | Actual exact archive and location | B1 native tool operations and reopening. |
|
||||
| Add / source chooser / empty input / auto-verify / logs / No/default Yes | Actual source and Qt | B1 duplicate-plus-independent Add; B3 reimport. |
|
||||
| Same-name update / wrong source / reselection / No/default Yes | Actual source and Qt | B2 mismatch rejected before writing; B3 correct update. |
|
||||
| Remove / hidden source chooser / No/Yes / result | Actual source and Qt | B3 REMOVED and native catalog absence before reimport. |
|
||||
| CBB backup recovery / empty input / chooser Cancel / No/Yes | Actual source and Qt | B3 original controls/full sequence; B13 full serial metadata/source-validation/install/target-validation sequence. |
|
||||
| Management stop-after-current | Two-item Qt/real admission tests verify next item skipped, including failed readback and unknown release | B3 stop during native Add; mandatory current-item readback completed. |
|
||||
| Queued cancellation / active dialog close | Qt queue, close, hard-cancel and shutdown tests | B10 recovery dialog queued behind an owned diagnostic, Cancel queued clicked, UI CANCELLED/no native admission/no recovery job. Underlying diagnostic verify-96d285ffa450 completed CHECKED/safe. Earlier second management submission/active lower Close remained disabled. |
|
||||
| Residual sessions / Recheck / Confirm / Close | Qt exact scope, one-intent observer promotion and real Windows proofs | B5 zero-active-session release; B9 initial inspection and one-confirmation release of a real B5 cancelled session; previous failed/multiple confirmations retained. |
|
||||
| Native details / Save prompt / native Cancel / forced termination | Qt exact ownership/prompt and default-Cancel tests | Disabled with no matching active owned client. No forced native termination claimed. |
|
||||
| Conditional result recovery/release/resume buttons | Qt target binding, stale results and single continuation | B10 actual result Release and Continue/no-replay receipts above. B10 ordinary retained startup required manual cleanup; B13 automatic ordinary Stop acceptance is recorded separately below. Other fault-dependent recovery branches are not blanket passed. |
|
||||
| Three-second defaults / manual-vs-deadline / hidden or closed prompts | One-shot Qt timer tests | Actual management/recovery No and timed Yes; full timing competition covered in Qt. |
|
||||
| Double submission / result remaining open / view changes / restart | Qt and Windows lifecycle tests | Active execute controls disabled; modeless dialogs and view changes observed; B4 no replay. |
|
||||
| Open logs/evidence / shell errors | Qt dispatch and error reporting | B10 actual Open logs/Open exception clicks opened exact application logs and verify-e464474b7bab folders; complete private Explorer breadcrumbs recorded. Only the two task-created Explorer windows normally closed. No shell-error case is claimed. |
|
||||
|
||||
One B1 harness edit targeted the library textbox while a modeless dialog changed control indices. The immutable original-library operation still completed and the changed view was invalidated. This is retained as a harness/misuse event, not a product search failure.
|
||||
|
||||
## Final-wave evidence and limits
|
||||
|
||||
B14 EXE SHA-256: `0cd5f37b113802bcf3abd07a94d8c5b9f73d40696b1c56af66fedf39112e2d8c`. ZIP SHA-256: `a580e3e9945261761e0eb3968b4e271d9f4745ce982dea96c283af4ab06e565f`. All 68 packaged product modules/resources and all 242 extracted files match source/build. Five pre-cancelled frozen routes and common GUI/worker/owner-probe/dialog-agent smoke passed. Full-suite log SHA-256: `d9c57b7998e02154fb703f0fe2ba1f37f73dc4687d116c4b6efc0e5ad7e5c30e`; JUnit SHA-256: `4303cc123e90689103cc4135e483ac936b04a052067e952a1861ae167c7811ea`. Native clients and writer/management mutexes were idle before and after the full suite.
|
||||
|
||||
B13 (`5e9509e`) retains EXE `966e00fe57eccbdf4975c624026d39d24d4613f4174a932db248fb444a7caa9d` and ZIP `7a1da94e05b85873f791cde77907bdc280106768fbf84e5d89066ab8aa57a61b`. A final self-audit found that the new ordinary explicit-release branch bypassed existing cold-observer promotion. Its focused test failed before the two-line ordering correction at `c1e2596`; 110 related tests then passed in 21.96 seconds, including actual harmless worker exit, cold-observer promotion and queue proof. The in-progress B13 full suite was interrupted through its own execution session before editing, and is archived without a completion/JUnit claim. No additional native matrix was run for this narrow B14 delta.
|
||||
|
||||
The three review defects had retained RED evidence: actual MainWindow subprocess exit hung on stalled hash/copy/validation; real recovery callers held the unrelated native channel and could install after abandoned metadata; ordinary cancelled startup failed to clean a later loaded target. B13 related observer coverage passed 232 tests in 34.81 seconds, including an actual two-process mutex/file race between observer and explicit release plus a process restart. These race tests stub the native evidence/action boundary; they are not Mentor window tests.
|
||||
|
||||
B12 (`906cfc0`, EXE `7d7929d6621ae6c379205380e06f94eb076135343417d000018a8ab04efea8cc`, ZIP `bbe68005469d8b6cf87726200ef85646e442de45d164ab2ac0aec23b51d0bd65`) retained a new failure: ordinary `verify-642171759614` returned its visible cancellation terminal state in 7.797 seconds, but Forward loaded at 34.406 seconds, after the worker cleanup budget. Exact manual No/normal Close was used solely to clear that failed run. A later independent queue-helper attempt was refused with sharing violation 32 before native creation while two releasing observers raced for the coordination lease. Both failures are archived and are not relabelled as B13 passes.
|
||||
|
||||
B13 ordinary `verify-71aee0603183` reached the visible terminal state in 7.375 seconds. Its candidate worker acknowledged Tip at 21.359 seconds, Forward No at 27.422 seconds and one Close at 28.750 seconds; native exit followed the original cleanup deadline. Read-only sampling confirmed kernel exit. The original result remains CANCELLED/safe=false. No Release click or manual ordinary native action occurred. The helper stayed observe-only until the actual candidate produced fresh RELEASED proof, then obtained its own independent fresh proof. Its prequeued real Versions client `native-backup-b63e7f708fd5` was created 5.220 seconds after the candidate proof and 1.506 seconds after the independent proof, loaded the backup catalog and closed normally. This is **cross-owner queue acceptance**, using source-hash-pinned production queue/observer/native-worker modules; it is not survival of work in the same app after global Stop. The candidate itself performed every ordinary No/Close action.
|
||||
|
||||
The B13 native run issued Close within the first worker budget, so the new retained-phase No/Close branch was **NOT REPLAYED in Mentor**. That branch has source guard, real process race/restart and existing real Win32 adapter evidence. No repeated cold-start attempts were used to manufacture a slower launch.
|
||||
|
||||
B13 actual recovery `backup-restore-3f98efb14448` used the current pending original target and healthy independent source A. Its isolated source and installed target both returned PASS/GREEN/safe; native save/close/release completed without intervention. The old Work directory is retained and all 366 original source files are unchanged. The 27,689-file complete validation library copy progressed through the serial metadata path without a false inactivity handoff.
|
||||
|
||||
Separate frozen metadata-exit harness EXE SHA-256: `7490be1988d823944307510f7cfd22c85cf8570c7c25f6ee60d97f542bb72753`. All 68 packaged product modules equal final B14. A disposable I/O stall at each of hash/copy/validation exercised actual MainWindow close and interpreter exit before releasing the stall; no late dispatch occurred and partial copies were retained. This uses an acceptance-only entry, **not stall injection into the candidate EXE**. The earlier B12/B13 harnesses and all RED/setup attempts remain archived.
|
||||
|
||||
The original complete fault-bearing field snapshot remains unavailable (**NOT REPRODUCED**); the constructed partial copy remains **COPY_BLOCKED** and was never opened. Windows 10 and production SMB remain **NOT RUN**. The earlier first-pass B-control PENDING result and explicit retry remain separate outcomes. No merge, publication or issue closure is performed.
|
||||
|
||||
## Constructed copy and remaining limits
|
||||
|
||||
Constructed-copy experiment: **COPY_BLOCKED; inconsistency NOT REPRODUCED** (1 attempt, maximum 3). The healthy control passed normal native Verify. On a separate disposable copy, the documented native property write and stock Save actually ran; ordinary Work copying encountered Windows sharing violation 32 at the 113th attempted file, database/icdb.dat, after 0.470 seconds. The source still completed Save/Close and authoritative PASS/GREEN with released resources. The partial clone was never opened and no native Repair claim is made for it. This fault-creation instrumentation did not modify the frozen product and does not reproduce the original field incident.
|
||||
|
||||
The original field inconsistency remains **NOT REPRODUCED**. Windows 10 and production SMB/network behavior are **NOT RUN**. Initial B-control PENDING results, diagnostic/manual-cleanup failures, metadata handoffs and the bounded file-probe timeout remain visible in the evidence. This report does not authorize merging, release publication or issue closure.
|
||||
@@ -1,114 +0,0 @@
|
||||
# Issue 15 runtime and recovery candidate
|
||||
|
||||
Refs #15. This candidate records local Windows 11 acceptance and its limits; it is not a published release or field-acceptance approval.
|
||||
|
||||
The final grouped review wave is implemented at `c1e2596` (B14). The complete suite passed **2,418 tests in 594.83 seconds**, actual exit code 0, with zero failures, errors or skips. Actual B13 ordinary Verify/Stop with automatic candidate-owned cleanup and cross-owner queued Versions passed; actual B13 CBB recovery passed source and target verification. B14 preserves explicit ordinary release promotion of an existing cold observer; that narrow change has source/real-process coverage and updated frozen checks. Native cases retain B13 identities. The final scoped independent review passed for 32dcd80..8869093: I1-I3 addressed; zero Critical/Important/Minor findings. This is a technical review, not field acceptance or merge/release approval.
|
||||
|
||||
The PR base is main at e4875b4. The branch also includes the previously approved efb8cae three-second confirmation defaults.
|
||||
|
||||
The change separates native task execution, client exit, coordination-lease release, data recovery and eligibility for the next write. A completed independent item no longer inherits another project's address or a stale historical blocker. Unknown ownership still requires fresh proof; the application does not delete native address or lock files.
|
||||
|
||||
## Final grouped review fixes
|
||||
|
||||
- Ordinary pre-document cancellation now requires positive supervisor and worker no-write events, a bound prelaunch log baseline, and exact worker/process/project/private-desktop identity. Potentially mutating supervisor actions and integration admission revoke this authority before dispatch. Proven no-write startup uses one 30-second cleanup budget and the existing five-second UI handoff; unproved ordinary cleanup and active-write waiting retain their existing policies. Ordinary global Stop still cancels its own queue.
|
||||
- A late loaded ordinary target may enter one separate retained cleanup phase only after its original worker/helpers have exited and fresh complete loaded evidence is available. The existing observer persists the intent and absolute 30-second deadline in the existing session record before any action, under the existing native management mutex. Duplicate observers, explicit release and process restart cannot start it again. Prior No/Tip acknowledgements and the sole Close remain deduplicated. Unknown or multiple documents, changed identities and active writes authorize no action. Cleanup return never establishes release or successful verification; queued writes still use fresh scoped resource proof.
|
||||
- Manifest hashing/copy/validation now run serially on the existing bounded daemon task. Nested executors no longer keep the Python interpreter alive after real MainWindow closure during stalled metadata I/O. Completed work renews inactivity; cancellation prevents late dispatch and incomplete copies remain available as evidence.
|
||||
- Backup recovery no longer holds the global native mutex during abandonable metadata work. It retains the exact library lease and completed-work fences. Only the short pair of Work renames, rollback and installed-state update is protected from abandonment; the task registry guard is never held over filesystem operations. Cancellation after that pair cannot start target verification. An OS rename that itself never returns cannot be safely interrupted; the implementation preserves ownership rather than claiming cancellation completed.
|
||||
|
||||
## Implementation
|
||||
|
||||
- Resource release uses exact project/database/library scope and observed process identity. Read-only file probes retain exclusive handles through release commitment. Legacy receipts are rechecked; a proof for one block cannot close another block's session.
|
||||
- Each UI operation owns its immutable requests, cancellation signal and view revision. Queued work and late callbacks cannot write into a replacement library view. Native writes stay serial; registered worker handles and event admission protect shutdown handoff.
|
||||
- Fast directory discovery and authoritative native catalog/status reconciliation are separate. Directory-only records are not treated as native entries. READY items remain available for management and are excluded from ordinary verification/maintenance admission.
|
||||
- Manual Repair and version history open the official tool for the exact selected project/database, including recovery-required projects. The application does not submit Repair automatically or treat tool closure as successful recovery or READY.
|
||||
- Results and management/recovery/release dialogs remain nonmodal. Three-second defaults preserve one-shot manual priority; unknown occupancy skips, exit saves, and forced termination defaults to cancellation.
|
||||
- Native acceptance exposed two premature timeouts: successful catalog completion after the metadata deadline, and a progressing complete-library manifest exceeding that deadline. Catalog commit/wait now uses the existing read-only native channel; successful metadata work renews inactivity without changing stalled-I/O limits or native transaction behavior.
|
||||
- A transient incomplete native-window scan is retried within the original open/close deadlines. Partial snapshots never authorize a control action. Persistent incomplete observation, unknown prompts and identity mismatches still fail closed.
|
||||
- Same-name update validates the resolved source project name before native removal. A mismatched source remains selectable in the dialog for correction; the UI preview performs no filesystem resolution. The native Add dialog fields are reread immediately before submission.
|
||||
- Save/Close may close the exact owned Project Integration panel only when all four complete statuses say no changes are pending and the unique Close control is enabled. Native inconsistency/error evidence takes precedence; partial, foreign or pending panels do not authorize closure.
|
||||
- A new explicitly confirmed recovery attempt can proceed after a fresh release proof for the exact library and block is recorded under that new operation. Old failed journals remain unchanged; default requests, cached proofs and proofs for another target cannot authorize a retry.
|
||||
- Hidden native worker failures now write compatible result records and tracebacks before exiting. Admission and entered-worker failures remain distinct, existing save evidence is preserved, and exceptions never establish release. This prevents a cancelled frozen worker from blocking on the packaging runtime's error dialog.
|
||||
- Completed release and occupancy checks now renew the existing metadata inactivity clock. Cancellation and abandoned calls cannot be revived; active native transactions keep their existing continuation rules. This fixes a frozen Add that expired across a successful seven-second release proof followed by two successful occupancy checks before any native write.
|
||||
- Diagnostic opening waits for an enabled target frame with no visible loading progress. After fresh project/PID evidence, its sole handler declines the exact owned Forward Annotation prompt. A close intent containing the current operation, target identity and nonce requires an exact supervisor acknowledgement after any in-flight dialog poll. The worker then rechecks readiness, prompts, native errors and cancellation before posting Close; acknowledgement consumes the original 30-second close budget. Ordinary Verify retains its own confirmation policy. A nested save prompt is accepted only through the captured, bounded chain of same-process, same-desktop, hidden disabled Expedition dialogs to the exact frame.
|
||||
- The management dialog's stop-after-current button and active-window close request now stop the batch at the next item boundary. The current item completes its native writes, required directory readback and result bookkeeping. A queued batch can still be cancelled before admission. Global cancellation, shutdown, process identity checks and worker admission remain separate. Real acceptance exposed the former hard-cancel signal interrupting the readback after successful Remove/Add.
|
||||
- Explicit release renews metadata inactivity after completed process snapshots, owner checks, held-file proofs and durable evidence steps. Multiple successful checks can finish without a false UI handoff; a single stalled step still times out. A late or cancelled proof cannot remove the coordination checkpoint or close the retained lease after its context has been abandoned.
|
||||
- Actual early Stop reproduced a late Tip arriving after the one normal empty-frame Close. Startup cleanup now retains the original process handle and, within the original timeout, can dismiss that exact known Tip after rechecking the private desktop, empty frame, complete windows and lack of progress/documents/unknown prompts. When Close already hid the frame, only the Tip's direct hidden, disabled owner is inspected; hidden MDI documents also veto the action. The deadline and release Stop signal are rechecked immediately before clicking. It never posts another Close. Normal residual release shares this guarded acknowledgement for already-retained sessions, then waits for exit without forced termination or another Close. PCB exit, launcher exit and resource release remain separate requirements.
|
||||
- A second actual cancellation race loaded the target after Tip dismissal, while COM/document admission had already stopped. Cancelled diagnostic startup now uses the existing fresh native path/PID logs and exact target MDI identity to decline Forward Annotation and finish one normal Close. Only exact owned No actions are allowed; unknown siblings, foreign identities, visible progress and writes remain protected. The supervisor completes its last poll before creating the cancellation signal, so cleanup is the sole prompt actor and does not wait for a normal-close acknowledgement. Its diagnostic 30-second cleanup budget starts once; an empty-to-loaded transition does not reset it. Cleanup never establishes CHECKED, READY or successful verification.
|
||||
- Diagnostic cancellation yields to the existing registered observer after a bounded five-second wait; ordinary write waiting is unchanged. If the worker exits before its native clients, the same observer keeps ownership until client exit and fresh scoped release proof. Queue admission waits only for an actual initializing or live observer, so historical caches and unrelated libraries cannot create a permanent wait. The original cancellation result remains historical evidence. Report completion writes only unique application evidence files and can finish while native cleanup continues.
|
||||
- Normal residual release can recover an older cancelled diagnostic startup using its complete existing registration, terminal worker, exact current native identity/command/private desktop/MDI and absence of Save evidence. That authority permits cleanup only; a missing prelaunch log baseline is never fabricated or treated as successful opening validation. The action rechecks binding immediately before each No or Close and respects a previously recorded close. Partial, foreign, active-write or ambiguous evidence remains blocked.
|
||||
- One normal Release confirmation gives that proven legacy diagnostic cleanup one 30-second budget, including the known transition after Forward No. It runs in the existing read-only native phase, then the existing registered observer can obtain fresh release proof after late exit without another confirmation. Observer promotion requires the same operation and current Windows user/session; cleanup requires exactly one target MDI document. Ordinary close remains three seconds and ordinary native-write waiting remains unchanged. Pure residual inspection uses metadata-only admission so it remains available during native finalization.
|
||||
|
||||
## Evidence retained locally
|
||||
|
||||
Task 1's durable findings are consolidated here rather than tracking orchestration scratch files. Its final scoped backend coverage was 420 tests after review fixes; those tests cover real Windows exclusive/duplicated handles, scoped receipt trust, cancellation and unknown export ownership. They do not establish real Mentor behavior. Subsequent task evidence and all failed attempts remain in the local acceptance evidence archive; raw field data, process snapshots, host/user identifiers and production paths are not included in this repository report.
|
||||
|
||||
The initial Task 5 full run had 2,111 passes and one obsolete internal test entry. The test now uses the dedicated catalog-only handler while retaining the original mapping-order assertions. A separate regression reproduced child Python importing another editable checkout; test-session configuration now preserves the active worktree in inherited PYTHONPATH without changing machine configuration.
|
||||
|
||||
## Native acceptance recorded so far
|
||||
|
||||
All native operations use complete, hash-verified local copies with main/PCB/database references bound to the selected copied library. Source and frozen runs use independent copies.
|
||||
|
||||
| Source scenario | Observed outcome |
|
||||
|---|---|
|
||||
| Native catalog | Four original registered entries and authoritative READY statuses confirmed; fast discovery alone was not accepted. |
|
||||
| Batch add with first-item name conflict | Existing name rejected safely; independent next source added and confirmed through native catalog/readback. Auto-verify was disabled; the new item remained pending. |
|
||||
| Manual Repair | Official confirmation cancelled without submission, then explicitly confirmed on the healthy added control. Native diagnostics/defragmentation completed; the native tool also reported a missing optional project file. This is not a reproduced field inconsistency. |
|
||||
| Manual backup and native restore | A uniquely described manual version was created; exact archive identity and restore location checked. Cancel and committed restore exercised; native restore and backup verification reported success. |
|
||||
| Versions reopening | Exact restored project reopened successfully; normal close exited with release confirmed. Tool closure alone did not claim repair/restore validation. |
|
||||
| ICDB check after restore | Initial observation-timeout failure retained; corrected same-button rerun returned CHECKED and safe resource release. It did not claim READY. |
|
||||
| Release observations | No active clients remained; zero active sessions were reported released while old observation records were cleared. Conditional native save/cancel/force controls remained disabled. |
|
||||
| Wrong-source same-name update | Earlier attempt exposed a missing name check and retained recovery-required evidence. The corrected UI rejects that source before submission and permits reselection. An audit of 21 major files in three unrelated blocks found no changes. |
|
||||
| Corrected update after recovery | Exact-name source restored the missing target. A new confirmed update in the original application data root succeeded with a fresh scoped release proof; the old recovery-required journal was preserved. |
|
||||
| Ordinary verification | Recovered target reached PASS/GREEN with native save committed, document closed, helper exited and resources released, without manual intervention. An earlier different target required manual native panel closure and remains classified as manual intervention. |
|
||||
| CBB backup recovery | Actual dialog empty-input rejection, chooser cancellation and No/Yes confirmation were exercised. The isolated source validation and installed target verification both passed with GREEN; the old Work directory was retained. No manual native intervention was needed. |
|
||||
| Automatic Project Integration panel close | The B control's first Verify automatically closed the completed panel and finished Save/Close/release, but authoritative status stayed PENDING and was correctly reported as FAIL. One explicitly requested fresh Verify then confirmed the native reusable-cell save and reached PASS/GREEN. The exact first-pass noncommit cause remains unconfirmed. |
|
||||
|
||||
The first full regression after these changes recorded 2,144 passes and eight fixture failures. Three tests still edited the old project filename, four lifecycle cases used an outdated control-helper signature, and one independent-item test reused a differently named source. The fixture updates preserve the original identity and lifecycle assertions. After the hidden-worker correction and isolation of simulated clients between tests, the full run at that stage passed **2,175 tests in 522.52 seconds**, exit code 0. The previous full regression at code commit 4402486 passed **2,246 tests in 572.82 seconds**, with zero failures, errors or skips and exit code 0. One earlier run was cooperatively interrupted after 2,151 passes when old test doubles contaminated the new entry tests; its stack and interrupted result are retained separately. Compilation and diff checks also passed.
|
||||
|
||||
The previous complete regression at code commit a3f69de passed **2,351 tests in 497.58 seconds**, exit code 0, with zero failures, errors or skips. Log SHA-256: `aa820f1202becd30ee220c8e660fcde0e063d9ed874023ab3487108aedae214d`; JUnit SHA-256: `7d951ad853978e58aabaa481656c15b8610f01fdf9d64f67af0585dda9bc3bbe`. Actual native applications were normally closed and the writer/management mutexes were idle before and after this run.
|
||||
|
||||
The previous candidate B9 is built from code commit a3f69de. All 68 packaged modules, assets, bridge programs, scripts and icon images match; all 242 ZIP-extracted files match the build. Executable SHA-256: `bfd6c122724f71a2aac4748ed01336a9949aa753f9c58aca55db574668140083`. ZIP SHA-256: `4c589bae6bf7b68732cd7ebe373b2924016c71f6731fd661c1cd0fd848427438`. Five actual pre-cancelled frozen entry routes exited without acknowledgement or termination and wrote the expected results. Common GUI, worker, owner-probe and dialog-agent smoke passed.
|
||||
|
||||
B9 repeated the two affected native cases. Versions was queued after exact diagnostic PCB registration and before Stop. The UI reached its cancellation terminal state in 6.672 seconds; the original result remains CANCELLED/safe=false. Automatic guarded Tip/Forward No/Close cleanup and the existing observer produced fresh library release proof; the queued Versions native client started 1.684 seconds after that proof and loaded its backup catalog. No Release click or manual diagnostic native action occurred. Separately, B5 produced a real cancelled, loaded-target legacy session. B9's initial inspection succeeded and one normal Release confirmation released the PCB, launcher and database server with fresh RELEASE_CONFIRMED proof in 22.634 seconds. The UI agreed and disabled Confirm; no Recheck, second confirmation, manual native action, Save, annotation or forced termination occurred. The old cancellation result was retained. The earlier B8 legacy path required multiple confirmations and is preserved as an incomplete workflow, not a final pass.
|
||||
|
||||
The [acceptance matrix](2026-11-17-issue15-acceptance-matrix.md) records each native case against its actual executable hash. Earlier successful cases remain bound to their original builds; they are not relabelled as new-build tests. The constructed-copy experiment ended with Windows sharing violation 32 at database/icdb.dat during native Save. Its source passed GREEN and released normally; the incomplete clone was never opened. The B5 early Stop returned CANCELLED with retained PCB/launcher and safe_to_continue=false; manual Tip OK alone completed the pending Close. That failure is preserved. The late-Tip fix and its new native acceptance are recorded separately.
|
||||
|
||||
## Limits
|
||||
|
||||
Review round 1 corrected two legacy-cleanup defects. The real residual snapshot adapter now retains hidden MDI document siblings before the exact-one-document guard, and a Tip without any previous Close returns to guarded loaded-target observation within the same deadline. A Tip after an actual Close retains wait-only behavior. The focused regressions first reproduced both failures, then 134 related tests passed; an independent harmless real Win32 window probe confirmed hidden-sibling no-action and the single-document normal Close path. This probe is not Mentor acceptance.
|
||||
|
||||
A delayed Tip dismissal regression then exposed repeated OK posts in the new continuation path. A separate set of Tip handles now limits acknowledgement to once per cleanup intent while retaining the original deadline and Forward handling. Final related coverage passed 180 tests in 29.43 seconds. The first round-1 full run retained 2,355 passes and one failed UI-reopen fixture: it claimed its worker had exited while registering the still-live pytest PID, so the real cold observer correctly blocked admission. The fixture now launches a harmless real worker, exercises actual mutex admission refusal, waits for real process exit and retains the original receipt/reopen assertions; its focused run passed. No product queue bypass or UI timeout increase was introduced.
|
||||
|
||||
B10 is built from `701e5cd`, with EXE SHA-256 `a6271e4219a02123e301ed1e0ea3109e78307bf1f92574b4a5cacb70690695a4` and ZIP SHA-256 `d4bd42416ea8d12a249ff1d9c8854eb76d2f81bb7ff869ff43dd92a331c647a0`. All 68 modules/resources and 242 extracted files match; five cancelled frozen entry routes and common smoke passed. Actual B5-to-B10 legacy diagnostic recovery used one confirmation, zero Rechecks/manual native actions, and reached fresh RELEASE_CONFIRMED after an intermediate PARTIAL; final receipt at 35.387 seconds and the UI agreed. This actual native case entered at loaded Forward; both Tip states are covered by focused regression, not claimed as newly replayed Mentor Tip states.
|
||||
|
||||
The final round-1 candidate B11 is built from `8818fa9`: EXE SHA-256 `03452e39f394c3c63113aaa701f64bacf14e817ae3b4e194965f333ecc645b98`, ZIP SHA-256 `34b3646b27afae22ec43a415ca19bbd32a91c0a4c941d37d6289c76cea9ca730`. Module/resource equality, all 242 extracted files, five cancelled frozen entries and common smoke passed. Only the residual-session module changed from B10 to add per-intent Tip acknowledgement tracking. B10 native/button receipts remain bound to B10; B11 delayed Tip behavior has source regression coverage, not a new actual Mentor Tip replay.
|
||||
|
||||
The final round-1 complete suite at `8818fa9` passed **2,358 tests in 451.34 seconds**, exit code 0, with zero failures, errors or skips. Log SHA-256: `5544f2e17f84a74e67faa81403a0b13679728c432ab269f2f5050cfe42103831`; JUnit SHA-256: `8e734b1f6298d368b1b059019e419b687c5284c472ad04a999f0b73e2254cd16`. Compilation/diff checks and the post-suite native-process/writer/management idle checks passed. The earlier failing run and test-harness setup failures remain archived.
|
||||
|
||||
The missing frozen controls were exercised on B10: Open logs and Open exception evidence opened the exact current application folders, verified by private-desktop Explorer breadcrumbs; queued CBB recovery was cancelled before admission and created no recovery job; result Release opened the correct residual plan; Continue started only the second previously skipped item, which passed GREEN, without replaying the terminal first item. The first result summary elapsed under its existing three-second Close default. After ordinary main-window Release and normal dialog closure, production code recreated the Continue summary; the observer clicked that actual enabled control without injecting results or calling application methods. One bounded repeat captured result Release within the default window.
|
||||
|
||||
That B10 button exercise exposed the **historical ordinary-verification cancellation defect**: Stop 0.547 seconds after first PCB registration, before any Save, returned CANCELLED/safe=false at PCB_STARTING; the target later loaded Forward Annotation and remained alive. The B10 automatic loaded-startup cleanup required diagnostic-only authority, so it did not clean this ordinary case. Exact manual Forward No and one normal Close after no-modal/no-progress checks were required before fresh release. The bounded result-button repeat reproduced the same retained state. These are failures of unattended ordinary cancellation, not successful automatic cleanup or protected active-Save cases, and remain preserved as failures; the grouped fix and B13 acceptance are recorded below.
|
||||
|
||||
The exact complete fault-bearing field snapshot is unavailable, so the original field inconsistency remains **NOT REPRODUCED**. Any bounded constructed live-copy experiment is reported separately. Windows 10 and production network/SMB behavior are **NOT RUN**. No merge, published release or issue closure is authorized by this candidate report.
|
||||
|
||||
One local B control required a second explicit verification after an initial completed native Save/Close left it PENDING. Both results are retained; automatic retries were not added and the initial failure is not counted as a pass.
|
||||
|
||||
## Final-wave evidence and limits
|
||||
|
||||
B14 EXE SHA-256: `0cd5f37b113802bcf3abd07a94d8c5b9f73d40696b1c56af66fedf39112e2d8c`. ZIP SHA-256: `a580e3e9945261761e0eb3968b4e271d9f4745ce982dea96c283af4ab06e565f`. All 68 packaged product modules/resources and all 242 extracted files match source/build. Five pre-cancelled frozen routes and common GUI/worker/owner-probe/dialog-agent smoke passed. Full-suite log SHA-256: `d9c57b7998e02154fb703f0fe2ba1f37f73dc4687d116c4b6efc0e5ad7e5c30e`; JUnit SHA-256: `4303cc123e90689103cc4135e483ac936b04a052067e952a1861ae167c7811ea`. Native clients and writer/management mutexes were idle before and after the full suite.
|
||||
|
||||
B13 (`5e9509e`) retains EXE `966e00fe57eccbdf4975c624026d39d24d4613f4174a932db248fb444a7caa9d` and ZIP `7a1da94e05b85873f791cde77907bdc280106768fbf84e5d89066ab8aa57a61b`. A final self-audit found that the new ordinary explicit-release branch bypassed existing cold-observer promotion. Its focused test failed before the two-line ordering correction at `c1e2596`; 110 related tests then passed in 21.96 seconds, including actual harmless worker exit, cold-observer promotion and queue proof. The in-progress B13 full suite was interrupted through its own execution session before editing, and is archived without a completion/JUnit claim. No additional native matrix was run for this narrow B14 delta.
|
||||
|
||||
The three review defects had retained RED evidence: actual MainWindow subprocess exit hung on stalled hash/copy/validation; real recovery callers held the unrelated native channel and could install after abandoned metadata; ordinary cancelled startup failed to clean a later loaded target. B13 related observer coverage passed 232 tests in 34.81 seconds, including an actual two-process mutex/file race between observer and explicit release plus a process restart. These race tests stub the native evidence/action boundary; they are not Mentor window tests.
|
||||
|
||||
B12 (`906cfc0`, EXE `7d7929d6621ae6c379205380e06f94eb076135343417d000018a8ab04efea8cc`, ZIP `bbe68005469d8b6cf87726200ef85646e442de45d164ab2ac0aec23b51d0bd65`) retained a new failure: ordinary `verify-642171759614` returned its visible cancellation terminal state in 7.797 seconds, but Forward loaded at 34.406 seconds, after the worker cleanup budget. Exact manual No/normal Close was used solely to clear that failed run. A later independent queue-helper attempt was refused with sharing violation 32 before native creation while two releasing observers raced for the coordination lease. Both failures are archived and are not relabelled as B13 passes.
|
||||
|
||||
B13 ordinary `verify-71aee0603183` reached the visible terminal state in 7.375 seconds. Its candidate worker acknowledged Tip at 21.359 seconds, Forward No at 27.422 seconds and one Close at 28.750 seconds; native exit followed the original cleanup deadline. Read-only sampling confirmed kernel exit. The original result remains CANCELLED/safe=false. No Release click or manual ordinary native action occurred. The helper stayed observe-only until the actual candidate produced fresh RELEASED proof, then obtained its own independent fresh proof. Its prequeued real Versions client `native-backup-b63e7f708fd5` was created 5.220 seconds after the candidate proof and 1.506 seconds after the independent proof, loaded the backup catalog and closed normally. This is **cross-owner queue acceptance**, using source-hash-pinned production queue/observer/native-worker modules; it is not survival of work in the same app after global Stop. The candidate itself performed every ordinary No/Close action.
|
||||
|
||||
The B13 native run issued Close within the first worker budget, so the new retained-phase No/Close branch was **NOT REPLAYED in Mentor**. That branch has source guard, real process race/restart and existing real Win32 adapter evidence. No repeated cold-start attempts were used to manufacture a slower launch.
|
||||
|
||||
B13 actual recovery `backup-restore-3f98efb14448` used the current pending original target and healthy independent source A. Its isolated source and installed target both returned PASS/GREEN/safe; native save/close/release completed without intervention. The old Work directory is retained and all 366 original source files are unchanged. The 27,689-file complete validation library copy progressed through the serial metadata path without a false inactivity handoff.
|
||||
|
||||
Separate frozen metadata-exit harness EXE SHA-256: `7490be1988d823944307510f7cfd22c85cf8570c7c25f6ee60d97f542bb72753`. All 68 packaged product modules equal final B14. A disposable I/O stall at each of hash/copy/validation exercised actual MainWindow close and interpreter exit before releasing the stall; no late dispatch occurred and partial copies were retained. This uses an acceptance-only entry, **not stall injection into the candidate EXE**. The earlier B12/B13 harnesses and all RED/setup attempts remain archived.
|
||||
|
||||
The original complete fault-bearing field snapshot remains unavailable (**NOT REPRODUCED**); the constructed partial copy remains **COPY_BLOCKED** and was never opened. Windows 10 and production SMB remain **NOT RUN**. The earlier first-pass B-control PENDING result and explicit retry remain separate outcomes. No merge, publication or issue closure is performed.
|
||||
@@ -1,38 +0,0 @@
|
||||
# PR 16 small review follow-up
|
||||
|
||||
Refs #15. Follow-up to review comment 446 on `b4737b5`; this does not authorize
|
||||
merging, release publication or issue closure.
|
||||
|
||||
- Verify now propagates a registered `TaskHandoff` instead of recording it as a
|
||||
close error and continuing a second native cleanup. It preserves the cancelled
|
||||
or failed result as evidence before returning cleanup ownership to the observer.
|
||||
- Repair runs local worker cleanup even when observer registration or handoff
|
||||
raises. A live native worker retains its existing observer-owned handles;
|
||||
`DesktopWorker.close()` does not terminate it or claim resources are released.
|
||||
- Starting an ICDB check binds the fallback Stop signal to the task's actual
|
||||
context. The normal global Stop and per-task cancellation policies are unchanged.
|
||||
- Native Versions/Repair errors now explain that the main PRJ must contain exactly
|
||||
one nonempty `iCDBDir` using a project-local relative path. Absolute paths,
|
||||
including absolute paths inside Work, and multiple entries remain unsupported.
|
||||
No PRJ is rewritten and no native tool is launched for rejected input.
|
||||
|
||||
The previously approved three-second defaults remain: submitted execution
|
||||
continues; unknown ownership/read-write confirmation skips; version selection
|
||||
uses the last manual save; exit saves; force termination defaults to cancellation.
|
||||
This follow-up does not add or change those product decisions.
|
||||
|
||||
## Validation
|
||||
|
||||
The unchanged targeted baseline passed 31 tests. New behavior regressions first
|
||||
recorded four failures and four passes; after the fixes all eight passed.
|
||||
Related Verify, Repair, native-entry, observer, ICDB/UI and shutdown regressions
|
||||
passed **363 tests in 157.24 seconds**, exit code 0.
|
||||
Compilation and whitespace checks also passed. Independent scoped review found
|
||||
zero Critical, Important or Minor issues in the follow-up fixes.
|
||||
|
||||
These are source tests with real task contexts and Qt controls; native process
|
||||
boundaries are replaced where the tests require them. This follow-up does not
|
||||
claim a new full-suite run, rebuilt frozen package, or actual Mentor acceptance.
|
||||
The earlier 2,418-test full run and B14 package still belong to source `c1e2596`.
|
||||
Original field inconsistency, the retained-phase native replay, Windows 10 and
|
||||
production SMB acceptance remain outstanding as documented in the main matrix.
|
||||
@@ -1,34 +0,0 @@
|
||||
# CBB 刷新校验 v0.2.4-beta.4
|
||||
|
||||
Refs #15。延续测试版发行,供隔离副本和现场进一步验证。
|
||||
|
||||
## 本版改动
|
||||
|
||||
- 分开任务执行、原生客户端退出、资源释放及数据待恢复状态,减少旧记录和无关工程导致的误阻塞。
|
||||
- 普通校验启动阶段取消时,只有完整未写入证明和准确归属才能处理已知提示并安全收尾;原结果保留为取消,不改成 READY。
|
||||
- 已登记观察者可以持久化接管一次迟到启动的安全收尾;不循环重新打开或自动重放写操作。
|
||||
- 文件哈希、复制、校验不再因嵌套线程池阻止程序退出。恢复准备不长期持有全局原生通道,迟到任务不能继续安装。
|
||||
- 修正交接异常传递、Repair 本地资源清理、ICDB 停止信号绑定,以及管理窗口销毁后的迟到结果回调。
|
||||
- 保留当前图标、三个菜单、READY 操作范围及手动备份政策。版本/Repair 对绝对或多条 iCDBDir 的拒绝原因现在明确显示,不自动修改工程引用。
|
||||
- 沿用已确认的 3 秒默认策略;未知占用和读写确认默认跳过,强制终止默认取消。真实原生写入仍受保护。
|
||||
|
||||
## 发布验证
|
||||
|
||||
本次源码全量 **2,428 项通过,659.54 秒,退出码 0**;JUnit 零失败、零错误、零跳过。
|
||||
管理窗口销毁后的成功/失败回调先复现失败,再通过实际 Qt 信号测试验证修复。
|
||||
生命周期模拟测试隔离无关的机器 WMI/文件探测延迟,真实占用、独占句柄、资源证明和原生写入保护测试继续保留。
|
||||
新增发布改动经独立限定复核,无 Critical、Important 或 Minor 遗留项。
|
||||
|
||||
Windows 包使用合并后的 main 提交构建并上传云端;仓库当前未配置云端打包工作流。
|
||||
最终源码提交、冻结模块/资源及图标核对、冻结冒烟和 ZIP 校验结果见发行附件
|
||||
`release-info.json`、`release-smoke.json` 和 `SHA256SUMS.txt`。
|
||||
发布前因 C 盘耗尽中断的一轮,以及后续失败/修订的测试记录均保留,不计为通过。
|
||||
|
||||
## 使用与范围
|
||||
|
||||
完整解压 Windows ZIP,运行 `CbbRefreshVerify-Background/CbbRefreshVerify.exe`,保留 `_internal`。
|
||||
库写操作前按提示手动备份。程序回滚不能撤销已经完成的中心库写入。
|
||||
|
||||
自动 ICDB Repair 仍关闭。原现场不一致故障未完整复现;独立接管阶段的原生 No/Close 重放、Windows 10、生产 SMB 尚未验收。
|
||||
此前 B13 实际普通取消、后续原生调度与备份恢复的通过记录保留其原始源码/包版本,不能算成本发行包的原生重跑。
|
||||
发布测试版不关闭工单 #15,也不代表这些现场边界已经解决。
|
||||
@@ -1,21 +0,0 @@
|
||||
# CBB 刷新校验 v0.2.4-beta.3
|
||||
|
||||
本测试版整合 PR #14:普通 CBB 导入与可选导出诊断解耦、写前未知会话确认、PCB 打开句柄顺序修复、任务绑定中心库,以及审查评论 414/430 的修复。
|
||||
|
||||
- 无效来源、可选 Verify 失败不再阻止已释放的独立条目继续。上传完成、校验通过和 READY 分开报告。
|
||||
- 无法取得写入确认、或恢复安装前跳过,记录为 SKIPPED;取消为 CANCELLED,保留具体原因。
|
||||
- 文件身份采集失败仍为 RECOVERY_REQUIRED;由独立的原生退出和资源证据决定后续资格,禁止自动重放该目标。
|
||||
- 无未知原生客户端时只探测一轮;等待用户确认后仍重新检查进程和资源。
|
||||
- 保留三个横向菜单和当前图标,不自动备份整个中心库;写操作前仍需人工备份。
|
||||
|
||||
下载 Windows ZIP 后完整解压,运行 `CbbRefreshVerify-Background/CbbRefreshVerify.exe`,保留同目录 `_internal`。
|
||||
发布程序由 Windows 主机从合入后的 main 构建并上传云端;不标记为云端 Windows runner 构建。
|
||||
发行附件的 `release-info.json`、`release-smoke.json` 和 `SHA256SUMS.txt` 记录实际提交、验证结果及文件散列。
|
||||
|
||||
导入确认原生注册、名称/分区、工程关联、允许的顶层块及 Layout,未证明原理图语义等价。
|
||||
UPLOADED 不等于 READY;完整 Verify 独立可选。已有其他 LibraryManager 时原生入口仍拒绝,需正常关闭相关会话再继续。
|
||||
|
||||
自动 ICDB Repair 仍关闭。EDIF 崩溃根因、Windows 10、跨机器 SMB 和现场服务器会话失联修复仍未验收;
|
||||
测试版发布不代表这些问题已解决,不自动关闭工单。
|
||||
|
||||
回滚程序时完整解压此前发布包并在关闭新客户端后使用;程序回滚不撤销已完成的中心库写入,工程恢复须依据逐项证据和人工备份。
|
||||
@@ -9,12 +9,3 @@ Dependency rationale: library release imports native engineering identity and re
|
||||
Rollback: before dependents are merged, revert this commit. After merging dependents, revert in reverse order or use the previous candidate package after closing the current app. Code rollback does not undo a native transaction; use a consistent manual backup or explicitly selected native history on an isolated copy.
|
||||
|
||||
Validation: full Python suite 1,376 passed (one existing pywinauto COM-threading warning); compileall and git diff --check passed. Native field recovery, Windows 10 and cross-machine shared-library acceptance remain pending.
|
||||
|
||||
Review comment 344 follow-up (2026-11-09):
|
||||
|
||||
- Production status scans continue to query fresh bridge results. The low-level session now also defaults to fresh scans; explicit checkpoint reuse is documented as a controlled read-only option with no production resume promise.
|
||||
- `library-changes.json` declares `rule_version`, the selected `scope`, excluded directory categories and suffixes, positional runtime rules, runtime filenames/prefixes, and recognized coordination checkpoints. Names, suffixes, prefixes and native database locations come from the same constants used by semantic classification. These are differences in participating engineering files; excluded content is not proven unchanged, and unrelated CBB content is not checked.
|
||||
- Removed the tests-only `pcb_bridge.execution_outcome` helper. Production release safety continues to come from observed release state and remaining clients.
|
||||
- Unlocked primary snapshots hash the copy stream, then independently hash the final source and destination. Source reads decrease from three to two. Rejected the suggestion to remove/threshold the final source hash: size and mtime cannot detect same-size, same-timestamp source edits. Locked LMC/icdb streams and owned lock snapshots retain their existing behavior; no source-rehash skip flag is added.
|
||||
|
||||
Validation for this follow-up: 287 targeted cases passed through the isolated mutex/PYTHONPATH wrapper (`test_batch_status`, `test_batch_status_faults`, `test_review_backend_followup`, `test_scoped_manifest`, `test_pcb_bridge`, `test_management_retry_blockers`, `test_backup_recovery`, `test_library_lock`, `test_management`). AST parsing, `git diff --check`, and original newline-style checks passed. No real Mentor, COM automation, shared library or process control was exercised; no full-suite run was requested.
|
||||
@@ -1,7 +1,5 @@
|
||||
# CBB Batch Status Bridge Implementation Plan
|
||||
|
||||
Current behavior (2026-11-09): production status scans always query the bridge fresh and overwrite checkpoint evidence. `BatchStatusSession.scan` defaults to `resume=False`; `resume=True` remains an explicit low-level option for controlled read-only scans, not an exposed production resume feature. Its lightweight fingerprint cannot detect every native payload/database write, so saved READY/PENDING rows must not authorize production actions.
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Read 180 to 3000 CBB Verify states through one resilient x86 Mentor bridge session with checkpoint recovery and authoritative `READY/PENDING` results.
|
||||
|
||||
@@ -1,370 +0,0 @@
|
||||
# CBB 原生操作生命周期与只读边界 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking. 本计划默认在当前会话逐项执行,不隐含授权创建额外代理。
|
||||
|
||||
**Goal:** 消除保存阶段的自动强杀、管理工作进程失联后的无监督写入,以及 legacy 状态读取的隐式弹窗操作,同时保持工具可用和独立任务可继续。
|
||||
|
||||
**Architecture:** 复用现有 NativeQueue、LibraryLock、私有桌面和库外证据体系,补充一个保存事实解析模块与一个会话记录模块。先实现保存/停止策略,再补管理监督与跨重启观察,最后收紧读取路径并联调 GUI/CLI;不重写调度框架。
|
||||
|
||||
**Tech Stack:** Python 3.12、PySide6、pywin32、Windows、Mentor EE7.9.5、现有 32 位 cscript/VBS 与状态桥;不增加运行时依赖。
|
||||
|
||||
**Spec:** [2026-11-06-runtime-lifecycle-safety-design.md](../specs/2026-11-06-runtime-lifecycle-safety-design.md)
|
||||
|
||||
**Status:** 用户已于 2026-11-06 授权按本计划实施,正在独立分支执行。基线为 `5eb4b2d7ed09947f19310ba80ba3b9a2a09b6f7d`;本文件没有修改生产行为。
|
||||
|
||||
## Global Constraints
|
||||
|
||||
- 技术栈保持 Python 3.12、PySide6、pywin32、Mentor EE7.9.5,不增加运行时依赖。
|
||||
- 检验、ICDB 批量检查、中心库管理保持独立;ICDB 自动 Repair 继续关闭。
|
||||
- READY 条目继续排除维护;状态读取失败不伪造 READY,也不直接判定 ICDB 损坏。
|
||||
- 自动停止、超时、失败清理、监督器失联都不得强杀可能正在原生写入的进程或 COM 保存 helper。
|
||||
- UI、搜索、筛选、日志查看和只读浏览保持可用;一个未释放写入不得占着全局执行票据等待无限长时间。
|
||||
- 同库仍在进行的写入不可并发启动;已释放的单项失败不得阻止独立项,其他独立库可排队获得执行机会。
|
||||
- 历史 JSON 只触发身份及实际资源复核,不直接构成真实占用;报告错误不得伪造占用或永久禁用入口。
|
||||
- 不自动选择历史版本、重新导入、恢复备份、删除原生锁/地址文件或修改 LMC 伪造状态。
|
||||
- 不新增全库自动备份或全库内容哈希;此前确认的人工备份策略不变。
|
||||
- 确认结束客户端与正常停止分开;本轮不增加“放弃正在进行的保存”按钮,不自动放宽服务器保护。
|
||||
- 原生动作、证据读取、路径解析、进程查询和重启核对都放在非 GUI 线程;GUI 只更新视图和提交用户意图。
|
||||
- 保留 VerifyRequest / VerifyResult 的现有参数及 safe_to_continue 兼容性,只追加有默认值的事实字段。
|
||||
- 保持原有文件行尾,不进行与功能无关的整文件规范化。
|
||||
- 开发验证只使用临时数据、模拟原生边界或隔离副本;不在生产库制造保存中断。
|
||||
|
||||
## 实施起点与三个交付单元
|
||||
|
||||
执行前重新读取 PR #10/#11/#12、main 和本地工作树,不将旧评论当成新实现的批准。另开 `codex/runtime-lifecycle-safety` 临时分支,使用独立工作树;保留用户原始脏工作区与已运行程序,不 force-push。
|
||||
|
||||
- **A:保存与停止闭环。** Task 1–4 作为一个功能单元验收;前面的模型和 primitive 可以独立提交,接线未完成时不交付候选程序。
|
||||
- **B:管理失联与重启核对。** Task 5–6,在 A 的协议上扩展管理;不增加自动清除锁文件。
|
||||
- **C:只读边界与交付验证。** Task 7–9;最终创建仅含本轮差分的草稿 PR,按 A/B/C 给出审查顺序。
|
||||
|
||||
### Task 1:建立保存事实解析与停止判据
|
||||
|
||||
**Files:**
|
||||
- Create: `src/cbb_refresh_verify/operation_lifecycle.py`
|
||||
- Create: `tests/test_operation_lifecycle.py`
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: 本轮 helper 的标记序列与独立进程/资源观察结果;不读取文件或调用 COM。
|
||||
- Produces: `classify_save_state(markers: Sequence[str], *, helper_exited: bool | None, native_released: bool | None, forced: bool = False) -> dict[str, str | bool]`。
|
||||
- Produces: `stop_disposition(*, call_started: bool | None, call_returned: bool | None, identity_confirmed: bool) -> str`,返回 CANCEL_BEFORE_CALL / WAIT_FOR_RETURN / CLEANUP_RETURNED / OBSERVE_UNCONFIRMED。
|
||||
- 返回字段固定为 save_state、close_state、helper_state、resource_state、interrupted、detail,取值见设计第 4 节;其他任务不得另造不兼容枚举。
|
||||
|
||||
- [x] **Step 1: 写失败测试,证明 Save/Close/释放不能互相替代。**
|
||||
|
||||
```python
|
||||
from cbb_refresh_verify.operation_lifecycle import classify_save_state, stop_disposition
|
||||
|
||||
def test_saved_but_not_closed_is_not_unsaved_or_fully_released():
|
||||
facts = classify_save_state(["SAVE_START", "SAVE_OK", "CLOSE_START"],
|
||||
helper_exited=False, native_released=False)
|
||||
assert facts["save_state"] == "COMMITTED"
|
||||
assert facts["close_state"] == "UNKNOWN"
|
||||
assert facts["resource_state"] == "RETAINED"
|
||||
|
||||
def test_process_exit_without_save_result_is_unknown():
|
||||
facts = classify_save_state(["SAVE_START"], helper_exited=True, native_released=True)
|
||||
assert facts["save_state"] == "UNKNOWN"
|
||||
assert facts["resource_state"] == "RELEASED"
|
||||
|
||||
def test_an_unreturned_call_requires_waiting():
|
||||
assert stop_disposition(call_started=True, call_returned=False,
|
||||
identity_confirmed=True) == "WAIT_FOR_RETURN"
|
||||
```
|
||||
|
||||
- [x] **Step 2: 运行并确认 RED。** `python -m pytest -q tests/test_operation_lifecycle.py`;预期缺少新模块/函数。再加取消前、SAVE_REJECTED、CLOSE_FAILED、日志截断/矛盾、forced=True 的行为断言,不把进程退出断言成保存完成。
|
||||
- [x] **Step 3: 实现纯判据。** 核心映射从明确证据出发:
|
||||
|
||||
```python
|
||||
save_state = ("COMMITTED" if "SAVE_OK" in markers else
|
||||
"REJECTED" if "SAVE_REJECTED" in markers else
|
||||
"NOT_STARTED" if "CANCELLED_BEFORE_SAVE" in markers else "UNKNOWN")
|
||||
resource_state = ("RELEASED" if native_released is True and helper_exited is True else
|
||||
"RETAINED" if native_released is False or helper_exited is False else "UNKNOWN")
|
||||
```
|
||||
|
||||
不把 UNKNOWN 当 False;矛盾标记降为 UNKNOWN 并记录原因。`forced=True` 不能把 UNKNOWN 的保存状态升级为成功。
|
||||
- [x] **Step 4: 运行该文件及 `tests/test_runtime_timing.py`,确认已有标记消费保持兼容。**
|
||||
- [x] **Step 5: 提交。** `git commit -m "feat: distinguish save close and resource release facts"`。
|
||||
|
||||
### Task 2:保存 helper 的启动门和完整返回事实
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/cbb_refresh_verify/save_verified_block.vbs`
|
||||
- Modify: `src/cbb_refresh_verify/desktop_worker.py:17`(launch_save_helper)
|
||||
- Modify: `src/cbb_refresh_verify/mentor_adapter.py:818`(保存启动和等待)
|
||||
- Modify: `tests/test_save_helper_runtime.py`
|
||||
- Modify: `tests/test_failure_lifecycle.py`
|
||||
- Create: `tests/test_save_helper_identity.py`(基线没有此文件,用于 helper 启动门和精确身份测试)
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: Task 1 的 `classify_save_state`。
|
||||
- Produces: VBS 标记 CANCELLED_BEFORE_SAVE / SAVE_START / SAVE_OK / SAVE_REJECTED / POST_SAVE_FAILED / CLOSE_START / CLOSE_OK / CLOSE_FAILED,以及既有 LICENSE_OK / IS_SAVED / QUIT_OK。
|
||||
- `launch_save_helper(command, **kwargs)` 保持原调用兼容;生产调用附加第 4 个 VBS 参数 `start_gate`,helper 未放行时不进入 COM;已有三参数 harness 保留兼容覆盖。
|
||||
- helper 启动门在 30 秒内未放行或取消时,以明确的启动前取消结果退出。门放行前记录精确 helper 身份,不靠事后按父 PID 猜测。
|
||||
|
||||
- [x] **Step 1: 扩展真实 cscript harness,先复现保存中取消和保存后关闭失败。** 继续使用 `tests/test_save_helper_runtime.py` 中实际 VBS 源码,仅替换 COM 创建。FakeDoc.Save 内创建取消文件后返回 True;FakeDoc.Close 返回 False 或延迟返回。断言:
|
||||
|
||||
```python
|
||||
assert "SAVE_OK" in completed.stdout
|
||||
assert "SAVE_REJECTED" not in completed.stdout
|
||||
assert "CLOSE_FAILED" in completed.stdout
|
||||
assert completed.returncode != 0
|
||||
```
|
||||
|
||||
另写门未打开的 harness,在 FakeDoc.Save 中写 `save-called.txt`;取消/门超时后该文件必须不存在。
|
||||
- [x] **Step 2: 运行 `python -m pytest -q tests/test_save_helper_runtime.py tests/test_failure_lifecycle.py -k "save or helper"`,确认新行为失败。** 不运行真实 Mentor 保存。
|
||||
- [x] **Step 3: 按调用边界写标记,取消只阻止尚未开始的写入。** 局部错误检查示例:
|
||||
|
||||
```vb
|
||||
CheckCancellationBeforeSave
|
||||
WScript.Echo "SAVE_START"
|
||||
On Error Resume Next
|
||||
operationOK = doc.Save()
|
||||
saveError = Err.Number
|
||||
saveDescription = Err.Description
|
||||
Err.Clear
|
||||
On Error GoTo 0
|
||||
If saveError <> 0 Then
|
||||
WScript.Echo "SAVE_RESULT_UNKNOWN|" & CStr(saveError) & "|" & saveDescription
|
||||
WScript.Quit 11
|
||||
End If
|
||||
If Not operationOK Then
|
||||
WScript.Echo "SAVE_REJECTED"
|
||||
WScript.Quit 4
|
||||
End If
|
||||
WScript.Echo "SAVE_OK"
|
||||
```
|
||||
|
||||
把 `saveError/saveDescription` 加入 Option Explicit 的 Dim。IsSaved/后置同步/Close 使用同样局部检查并写各自原因,不抹掉 SAVE_OK;取消后只在精确文档、已保存且没有未知模态提示时做既有正常关闭,不再次 Save、不自动放弃脏文档。
|
||||
- [x] **Step 4: 保存等待不再因取消文件出现就直接抛错丢弃监督。** 本任务先提供可观察的调用返回事实;Task 4 再统一所有生产停止入口,不能保留“保存脚本启动后随便 terminate”的中间交付。
|
||||
- [x] **Step 5: 重跑真实 cscript harness、身份核对和 runtime_timing 回归,通过后提交。** `git commit -m "fix: preserve native save results across cancellation"`。
|
||||
|
||||
### Task 3:受控会话记录和后台观察交接
|
||||
|
||||
**Files:**
|
||||
- Create: `src/cbb_refresh_verify/session_record.py`
|
||||
- Create: `tests/test_session_record.py`
|
||||
- Modify: `src/cbb_refresh_verify/desktop_worker.py`
|
||||
- Modify: `src/cbb_refresh_verify/library_lock.py`
|
||||
- Modify: `src/cbb_refresh_verify/network_path.py`
|
||||
- Test: `tests/test_network_release_safety.py`
|
||||
|
||||
**Interfaces:**
|
||||
- Produces: `write_session_record(path: Path, record: Mapping[str, object]) -> None`,原子 pending→replace,flush/fsync。
|
||||
- Produces: `read_session_record(path: Path, *, evidence_root: Path) -> dict`,协议 `cbb-runtime-session`、version=1,最大 64 KiB,拒绝重解析点/越界路径。
|
||||
- Produces: `reconcile_session_record(path: Path, *, evidence_root: Path) -> dict`,仅后台核对,返回 ACTIVE / RELEASED / IDENTITY_CHANGED / UNCONFIRMED、原因、匹配库及独立 release_proof;不终止进程、不执行写操作。
|
||||
- Produces: `observe_retained_session(path: Path, *, evidence_root: Path, stop=None, progress=None) -> dict`,1 秒为观察间隔,单次进程查询有界;退出观察不表示原生进程退出。
|
||||
- immutable `session.json`、单写者 `worker-state.json`、watchdog 的 `supervisor-lost.json`、观察者的 `observation-<observer_id>.json` 分开,不互相覆盖。
|
||||
- 等待循环只使用精确句柄的零等待观察,不持有 `_guard`/全局原生互斥,不循环扫描全库。退出后才尝试独立释放证明;通道忙只延后该观察,不把其他库也设为不可用。
|
||||
|
||||
- [x] **Step 1: 写协议/重启身份测试。** 使用临时 JSON 和本测试创建的 sleep 子进程;在记录上替换 created 或 executable,确保返回 IDENTITY_CHANGED 而不是结束新进程。损坏 JSON、超过 64 KiB 和越界目录返回 UNCONFIRMED。
|
||||
|
||||
```python
|
||||
def test_record_outside_controlled_root_is_observation_only(tmp_path):
|
||||
from cbb_refresh_verify.session_record import reconcile_session_record
|
||||
owned = tmp_path / "owned"
|
||||
owned.mkdir()
|
||||
external = tmp_path / "external-session.json"
|
||||
external.write_text("{}", encoding="utf-8")
|
||||
outcome = reconcile_session_record(external, evidence_root=owned)
|
||||
assert outcome["status"] == "UNCONFIRMED"
|
||||
assert outcome["release_proof"] is None
|
||||
```
|
||||
|
||||
PID 复用测试在本测试创建的进程身份记录上替换 created/image,再走同一个 reconcile 入口;只模拟外部进程观察边界,不用实现返回值代替被测流程。
|
||||
- [x] **Step 2: 运行 `python -m pytest -q tests/test_session_record.py`,确认 RED。**
|
||||
- [x] **Step 3: 实现精确身份、记录路径约束与独立释放证明。** 核对 supervisor/worker/helper/native 的创建时间、映像和当前用户/Windows 会话。PID 不在快照中不能直接生成 RELEASED;复用现有 `release_retained_library` 证明,不删 `.lock`/sAddress.adr。
|
||||
- [x] **Step 4: 增加后台交接测试。** A 库 helper 保持活跃,转观察后释放 NativeQueue action;同库写请求仍等待,B 库请求可运行。映射直到匹配库独立释放证明成立才归还;调用 `process.close()` 不得丢失观察所需的精确句柄。
|
||||
- [x] **Step 5: 验证报告写失败不终止活跃调用、不把记录存在本身当占用。** 内存观察保留,下一次可重新核对。通过后提交 `git commit -m "feat: persist and reconcile owned native sessions"`。
|
||||
|
||||
### Task 4:统一用户停止、超时、finally、kill 和 watchdog
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/cbb_refresh_verify/verify_runner.py:231`、`:951`、`:1067`、`:1090`、`:1128`
|
||||
- Modify: `src/cbb_refresh_verify/desktop_worker.py:25`、`:174`、`:182`、`:191`、`:224`
|
||||
- Modify: `src/cbb_refresh_verify/mentor_adapter.py:830`、`:888`、`:1005`
|
||||
- Modify: `src/cbb_refresh_verify/verify_runner.py`(VerifyResult 默认字段与兼容 auto_repair 停止传播)
|
||||
- Modify: `src/cbb_refresh_verify/defaults.py`(NATIVE_WRITE_STOP_WAIT_SECONDS)
|
||||
- Modify: `src/cbb_refresh_verify/native_repair.py:127`(增加 stop=None 并向现有 run_native_repair 传播;默认 auto_repair 不变)
|
||||
- Test: `tests/test_failure_lifecycle.py`
|
||||
- Test: `tests/test_abnormal_shutdown.py`
|
||||
- Test: `tests/test_verify_worker_stability.py`
|
||||
- Test: `tests/test_incident_safety.py`
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: Task 1–3 的事实解析、停止判据与后台观察。
|
||||
- `_stop_worker(process, *, timeout=5)` 保持 bool 返回兼容,但不再对未知/活跃写调用自动 kill;返回 False 表示尚未确认 worker 退出,调用方转受控观察。
|
||||
- `VerifyResult.write_outcome: dict | None = None`、`session_record_path: Path | None = None` 追加在现有默认字段之后。
|
||||
- `attempt_recovery(request, diagnosis, evidence_root, *, progress=None, stop=None)` 只补取消传播,不使其默认启用。
|
||||
- 保存等待转后台的默认界限为 120 秒,放在 `defaults.py` 的 `NATIVE_WRITE_STOP_WAIT_SECONDS`;普通合作式停止等待保持 5 秒。
|
||||
|
||||
- [x] **Step 1: 替换冲突的旧期望并增加跨组件失败测试。** `test_stop_cancels_then_stops_automation_client_after_deadline` 不能再锁定保存中会 kill 的行为。用本测试创建的 helper 进程触发 `_stop_worker`,使 `kill` 和 `stop_automation_clients` 在活跃 Save 时被调用即失败:
|
||||
|
||||
```python
|
||||
class SavingWorker:
|
||||
def request_stop(self): self.requested = True
|
||||
def wait(self, timeout): raise TimeoutError("native Save pending")
|
||||
def poll(self): return None
|
||||
def kill(self): raise AssertionError("pending Save was killed")
|
||||
def stop_automation_clients(self): raise AssertionError("save helper was killed")
|
||||
|
||||
def test_cancel_preserves_pending_save():
|
||||
worker = SavingWorker()
|
||||
assert _stop_worker(worker, timeout=0) is False
|
||||
assert worker.requested
|
||||
```
|
||||
|
||||
这个 fake 只用于停止分派边界;另用实际 sleep/helper 与真实 VBS harness 验证生命周期,不只断言 mock 被调用。
|
||||
- [x] **Step 2: 覆盖五个触发入口。** 用户停止、活动超时、对话框错误、finally 收尾、父进程退出分别触发;verify 生产配置 `stop_clients=True` 必须在测试中出现,不只测默认参数 False。
|
||||
- [x] **Step 3: 接入同一阶段判据。** 原生调用可能进行中时只写取消意图;短等待后不关闭观察句柄,120 秒后交 Task 3 观察。只有已证明未进入写入的辅助进程允许终止。`DesktopWorker.kill` 及 watchdog 不能绕开此判据;保存 helper 的注册/启动门与 supervisor 失联竞争必须被覆盖。
|
||||
- [x] **Step 4: 清理前采样并保留中断事实。** 更新 session-release/outcome/result/recovery-required 的生成逻辑。后续发现进程退出可以更新 resource_state,但不能把未知保存重写成成功;正常关闭失败保留 COMMITTED。`safe_to_continue=True` 不删除 write_outcome 中的失败。
|
||||
- [x] **Step 5: 跑 `tests/test_operation_lifecycle.py tests/test_session_record.py tests/test_failure_lifecycle.py tests/test_abnormal_shutdown.py tests/test_verify_worker_stability.py tests/test_incident_safety.py`,通过后执行交付单元 A 的完整回归并提交。** `git commit -m "fix: honor native write boundaries on every stop path"`。
|
||||
|
||||
### Task 5:管理 worker 的监督器失联与事务边界取消
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/cbb_refresh_verify/native_management.py:132`、`:209`、`:694`、`:1131`
|
||||
- Modify: `src/cbb_refresh_verify/management.py`(run_management / run_management_batch)
|
||||
- Modify: `src/cbb_refresh_verify/management_transaction.py`(沿用原 nonce/lease 身份,不放宽验证)
|
||||
- Create: `tests/test_management_supervision.py`
|
||||
- Test: `tests/test_management_native_transaction.py`
|
||||
- Test: `tests/test_management_retry_blockers.py`
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: Task 3 的会话记录,Task 4 的阶段停止规则。
|
||||
- 管理 job 新增 `cancel_signal`、`session_record_path`、`start_gate` 与 supervisor 创建身份;原 desktop/supervisor_pid/timeout_seconds 保持兼容。
|
||||
- 新增私有 `_require_management_continuation(job, root)`:每次新原生调用前校验当前取消/监督器身份;被取消时抛已有管理错误并明确 native_started,而不是启动下一动作。
|
||||
- 现有 `_require_add_supervisor(job, root)` 调用共享判据并保留 add deadline 检查,不移除已有安全检查。
|
||||
|
||||
- [x] **Step 1: 写无监督器和双阶段 update 测试。** 在 catalog 前使 supervisor 退出,确保不创建 LM;remove 调用内部模拟父进程退出但保留 native owner,返回后确保 add 不调用。断言部分完成与资源释放分别记录:
|
||||
|
||||
```python
|
||||
assert result.status == "RECOVERY_REQUIRED" # remove 已发生,add 未发出
|
||||
assert adapter.calls == ["remove"]
|
||||
assert result.safe_to_continue is True # 本例原生 owner 已独立证明释放
|
||||
assert not any(call[0] == "add" for call in adapter.calls if isinstance(call, tuple))
|
||||
```
|
||||
|
||||
- [x] **Step 2: 对 catalog/add/remove 三条 worker 路由分别触发取消和父进程退出。** 正在 native wait/COM 调用时 helper/worker 存活,返回后不进入下一写动作;同目标不得自动重试。
|
||||
- [x] **Step 3: 启动前持久登记并使用 gate,worker 在身份检查后 armed watchdog。** watchdog 只写自己的失联文件和取消信号,不异步退出正在做原生调用的工作进程。调用返回后执行正常自有会话收尾;未知弹窗记录并交已有提示入口。
|
||||
- [x] **Step 4: 将仅依赖 `_pending_workers/_retained_workers` 的判据补为内存+可核对记录。** 内存列表继续用于同一进程的快速收尾,但不是唯一恢复入口;读不到 result.json 不能永久推断 owner 活着。
|
||||
- [x] **Step 5: 跑管理三个测试文件与 `tests/test_native_management.py tests/test_native_export_guard.py`,通过后提交。** `git commit -m "fix: supervise management workers across cancellation and parent loss"`。
|
||||
|
||||
### Task 6:重启核对和相关库范围的可操作入口
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/cbb_refresh_verify/session_record.py`
|
||||
- Modify: `src/cbb_refresh_verify/residual_sessions.py`
|
||||
- Modify: `src/cbb_refresh_verify/ui/residual_release_dialog.py`
|
||||
- Modify: `src/cbb_refresh_verify/ui/main_window.py`
|
||||
- Test: `tests/test_session_record.py`
|
||||
- Test: `tests/test_review_release_followup.py`
|
||||
- Test: `tests/test_ui_lease_lifecycle.py`
|
||||
- Test: `tests/test_background_queue_regressions.py`
|
||||
|
||||
**Interfaces:**
|
||||
- Consumes: A/B 单元生成的 session.json/worker-state/observation 记录,保留已存在的 release_proof / released Signal 兼容。
|
||||
- GUI 后台核对只显示状态,不自动点击原生提示、不重放新增/更新/移除、不仅按 Cbb 桌面前缀结束进程。
|
||||
- NativeQueue 使用已有 ready 回调查询已缓存的相关库可执行性;ready 自身不做 WMI、文件读取或 SMB 路径解析。
|
||||
|
||||
- [x] **Step 1: 写“重启时 active、exited、PID reused、记录损坏”四个场景。** 检查行为结果而不是只检查某函数调用次数:active 可看原生阶段,exited 需独立证明,reused 没有 native 消息,损坏记录不禁用全部 UI。
|
||||
- [x] **Step 2: 写 A 库等待、B 库可执行的队列测试。** 暂停保存的 A 保留关联租约,不占队列 active;B 可完成,A 同库新写操作不会进入。用户取消批次不会在恢复后自动重放。
|
||||
- [x] **Step 3: 接入启动时的后台发现与已有“查看原生提示/处理保存/请求原生取消/重新检查”。** 未知窗口只展示真实原因;记录 helper 正在 Save/Close 时不向普通强制结束路径放行。不为“能释放”而新增任意杀进程按钮。
|
||||
- [x] **Step 4: 证明成立后只解除匹配会话的历史记录和映射。** 关闭自有 desktop 句柄,不能宣称已删除仍有原生引用的桌面。报告保存失败单独展示,不把有效释放反转成真实占用。
|
||||
- [x] **Step 5: 跑上述四个文件与 `tests/test_residual_sessions.py tests/test_residual_release_dialog.py`,再跑 A+B 完整回归后提交。** `git commit -m "fix: reconcile retained sessions without blocking independent libraries"`。
|
||||
|
||||
### Task 7:关闭 legacy 读取的隐式启动和肯定按钮回退
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/cbb_refresh_verify/library_reader.py:249`、`:340`
|
||||
- Modify: `src/cbb_refresh_verify/mentor_adapter.py:1453`、`:1532`、`:1629`
|
||||
- Modify: `src/cbb_refresh_verify/ui/main_window.py:114`
|
||||
- Create: `tests/test_readonly_status_policy.py`
|
||||
- Test: `tests/test_library_reader.py`
|
||||
- Test: `tests/test_batch_status_faults.py`
|
||||
- Modify: `tests/test_desktop_worker.py`(旧 reader 必启动私有桌面的测试改为可达新边界)
|
||||
|
||||
**Interfaces:**
|
||||
- 默认 authoritative_status_map 入口不变;桥返回失败仍使用 UNKNOWN / UNAVAILABLE,不能升级为 PENDING/READY。
|
||||
- `read_library_flag(library, name, *, timeout_seconds=90, log_path=None)` 与 `read_library_tree_image_map(library, names, *, timeout_seconds=45, log_path=None)` 保留调用签名和返回形状,但只观察已存在、匹配库身份的 LM;不自动启动新的 LM。
|
||||
- 无匹配 LM 返回原有 FLAG_UNKNOWN 或 `{name: None}`,并附可读原因,不要求每次搜索/过滤都人工开 LM。
|
||||
- `handle_known_dialogs` 留给需要的已验证写路径;状态读取不调用它,不修改其他流程的弹窗规则。
|
||||
|
||||
- [x] **Step 1: 写未知提示和无 LM 的回归。** 把 CreateDesktop/CreateProcess/PostMessage 与 affirmative handler 设为触发即失败,调用两个兼容 reader 和 `scan_open_library_status`:
|
||||
|
||||
```python
|
||||
def test_status_read_does_not_launch_or_answer_when_lm_is_absent(monkeypatch):
|
||||
import win32process
|
||||
from cbb_refresh_verify import mentor_adapter
|
||||
monkeypatch.setattr(win32process, "CreateProcess",
|
||||
lambda *a, **kw: (_ for _ in ()).throw(AssertionError("implicit LM launch")))
|
||||
# 该测试文件的 FakeDesktop.windows() 返回 [],不连接实际 LM。
|
||||
assert mentor_adapter.read_library_tree_image_map("C:/Fixture/lib.lmc", ["A"]) == {"A": None}
|
||||
```
|
||||
|
||||
再对“修复/覆盖/保存/未知许可提示”的窗口快照参数化,要求没有任何消息发送。
|
||||
- [x] **Step 2: 运行 `python -m pytest -q tests/test_readonly_status_policy.py`,确认 RED。**
|
||||
- [x] **Step 3: 去掉读取路径的自动创建和通用肯定应答。** 抽取最小既有 LM 树观察函数,使用 exact library identity,只读树项,不关闭用户打开的窗口;窗口不可读就返回未知。若发现其他调用方仍依赖隐式启动,迁到明确的原生工具打开入口或保留未知,不隐藏恢复原行为。
|
||||
- [x] **Step 4: 跑 reader/bridge/UI 状态回归,并用混合 READY/PENDING/UNAVAILABLE 清单检查数量和筛选。** 默认桥成功时不改变结果;legacy 无 LM 不弹每项确认、不启动 Mentor、不伪造损坏。
|
||||
- [x] **Step 5: 提交。** `git commit -m "fix: keep legacy status reads observational"`。
|
||||
|
||||
### Task 8:GUI/CLI 停止传播和结果展示联调
|
||||
|
||||
**Files:**
|
||||
- Modify: `src/cbb_refresh_verify/verify_runner.py:1251`(run_batch 默认 verifier 转发 stop)
|
||||
- Modify: `src/cbb_refresh_verify/ui/main_window.py:1504`
|
||||
- Modify: `src/cbb_refresh_verify/ui/icdb_check_task.py`
|
||||
- Modify: `src/cbb_refresh_verify/ui/management_dialog.py`
|
||||
- Modify: `src/cbb_refresh_verify/application.py`(CLI 信号进入本批次 stop)
|
||||
- Test: `tests/test_operation_queue.py`
|
||||
- Test: `tests/test_ui_batch_safety.py`
|
||||
- Test: `tests/test_background_queue_regressions.py`
|
||||
- Test: `tests/test_application.py`
|
||||
|
||||
**Interfaces:**
|
||||
- `run_batch(..., stop=event)` 的默认调用必须实际传 `run_verify(..., stop=event)`;外部注入 verifier 的原一参数签名保持不变。
|
||||
- UI 接受 write_outcome 和 session_record_path,但不直接读取/resolve 这些路径;通过现有 ServiceWorker 接收事实。
|
||||
- 文案分别为“已请求停止,等待当前保存返回”“保存已返回,关闭待确认”“已转后台观察,可查看状态”“当前状态无法确认”,只在对应事实成立时显示。
|
||||
|
||||
- [x] **Step 1: 写 CLI 默认 verifier 的 stop 传播测试与 GUI 延迟保存测试。** GUI 点击停止后 200ms 定时器仍可触发、搜索仍可编辑;新原生动作没有发出,进度不假称已保存或已释放。
|
||||
- [x] **Step 2: 写 action 抛异常、队列取消和按库 ready 的回归。** 保留已存在的 Event 轮询取消语义;不用无通知无限 wait;一项异常释放队列票据,后续可执行独立项不被遗留票据挡住。
|
||||
- [x] **Step 3: 接入停止来源与事实投影。** `auto_repair=False` 保持默认;兼容修复/复验的 stop 转发使用 Task 4 新签名。Save/Close 尚未确认时不启用本目标自动重试,也不禁用所有只读操作。
|
||||
- [x] **Step 4: 跑队列、后台、界面和 CLI 测试,检查退出/重启后未完成状态仍可见。** GUI 线程中将 Path.resolve、WMI、文件读取替换为失败哨兵,确认事实展示不触发它们。
|
||||
- [x] **Step 5: 提交。** `git commit -m "fix: propagate stop intent and display independent lifecycle facts"`。
|
||||
|
||||
### Task 9:完整回归、冻结包和隔离验收
|
||||
|
||||
**Files:**
|
||||
- Modify: `README.md`
|
||||
- Modify: `SOP.md`
|
||||
- Modify: `docs/ICDB-MANUAL-REPAIR-AND-UPDATE.md`
|
||||
- Create: `docs/releases/2026-11-06-runtime-lifecycle-validation.json`
|
||||
- Create: `docs/releases/2026-11-06-runtime-lifecycle-candidate.md`
|
||||
- Modify: `pyproject.toml`、`src/cbb_refresh_verify/__init__.py`(只在实际生成新候选包时递增为 0.2.4b2)
|
||||
- Test: `tests/test_packaging.py`、`tests/test_packaging_status_bridge.py`
|
||||
|
||||
**Interfaces:**
|
||||
- 验证记录必须关联最终 source tree SHA、测试 XML 哈希、实际版本、候选包 SHA-256、平台/Mentor 版本;缺少真实包或环境的项使用 not_run/unverified,不能写 passed。
|
||||
- 旧 `0.2.4b1` / `5eb4b2d` 的 1,631 完整回归和 63 项专项为历史基线,不是本轮验收结果。
|
||||
|
||||
- [x] **Step 1: 在独立测试互斥/临时恢复目录下串行跑最终完整套件。** `python -m pytest -q` 必须来自新工作树 src,子进程 PYTHONPATH 同步。不要同时在同一 runner 跑另一个使用真实产品互斥或固定恢复根的全量任务。
|
||||
- [x] **Step 2: 跑 `python -m compileall -q src tests` 和 `git diff --check`。** 保持源文件原行尾;记录预期 pywinauto COM 提示,新的警告另查。
|
||||
- [x] **Step 3: 生成候选包前更新为 0.2.4b2,按现有 spec 打包并运行 frozen 入口冒烟。** 验证 verify-worker、management-worker、owner-probe、dialog-agent 的模块/脚本可加载;运行“冻结程序 + fake 保存/管理 native 边界”的父进程退出与停止测试。构建环境缺外部依赖时记录具体缺项,不宣称已产生候选包。
|
||||
- [ ] **Step 4: 通过应用实际按钮运行隔离副本。** 单独记录 Save 前停止、Save 中停止、Close 延迟、管理父进程退出、legacy 未打开 LM、未知原生提示、独立库继续。缺实机场景保留未验收;不为验收在生产库保存中杀进程。
|
||||
- [x] **Step 5: 更新文档与审查描述。** 写清默认停止规则、后台观察范围、只读未知状态、真实 COM 无法取消的限制、程序回退与数据恢复的区别。测试用例数量不得替代场景证据。
|
||||
- [x] **Step 6: 提交候选记录,推送本轮差分草稿 PR。** `git commit -m "docs: record runtime lifecycle validation and candidate limits"`;按 A/B/C 提供审查顺序,不自动发布或关闭 ICDB 工单。若 main 已变化,重新整合并验证实际候选树。
|
||||
|
||||
## 验收映射与自查
|
||||
|
||||
| 审查问题 | 计划任务 | 必须看到的证据 |
|
||||
| --- | --- | --- |
|
||||
| P1-1 Save/Close 中自动强杀及误记安全 | 1、2、3、4、8 | 实际 helper 存活、无 terminate、保存/关闭/释放独立结果、跨入口停止一致 |
|
||||
| P1-2 管理失联后无监督操作 | 3、5、6 | 启动门、精确持久身份、失联取消、调用返回后无后续写入、重启可核对 |
|
||||
| P1-3 legacy 读取隐式启动/肯定应答 | 7、8 | 读取路径无 CreateProcess/点击/用户窗口关闭,未知状态可见 |
|
||||
| 直接相关停止传播和保存状态记录 | 1、2、4、8 | CLI/GUI 同一 stop,兼容修复链不吞 stop;COMMITTED 与关闭失败并存 |
|
||||
| 防止修复又导致整批/全工具卡死 | 3、6、8 | 有界等待后转观察;B 库执行,A 库活跃写入不并发;UI 始终可响应 |
|
||||
| 源码、冻结包和现场验收口径 | 9 | 三层分别记录,缺哪层明确保留,不能互相代替 |
|
||||
|
||||
本轮排除项见设计第 13 节。源文件行号以基线供定位,实施时先用 rg 重新定位所有调用方,不直接按旧行号打补丁。
|
||||
|
||||
实施记录:用户已授权执行。实施在当前会话逐项完成;独立只读审查按 requesting-code-review 技能执行,没有并行修改源码。保存启动门依赖会话协议,故先提交协议 primitive(97a3de2);mentor_adapter 的停止与只读修改共用文件,在 8d3eab1 合并提交 A/C 基础接线。管理接线为 6278091,界面及按库交接为 cb11624,独立审查修正为 d9a79b6、051498b。三单元联通后统一验证、生成候选,未提前交付不完整的 A 单元。真实环境未验收项见候选记录。
|
||||
@@ -1,25 +0,0 @@
|
||||
# Latest reviews for PR #10/#11/#12
|
||||
|
||||
Scope: user selected only the 2026-11-09 comments #309/#310/#313. Earlier deep-review backlog stays out of scope. Preserve ICDB automatic Repair OFF, serial writes, current icon and independent-library admission. No merge to main, issue closure or release.
|
||||
|
||||
## PR #10
|
||||
|
||||
- [x] Reproduce BlockA releasing historical BlockB checkpoints and retained owners without naming BlockB in proof.
|
||||
- [x] Record requested block, actual proof scope, checkpoint identities and foreign names in existing release proof. Preserve original checkpoint bytes and data_recovery_confirmed=False; no new blocking gate.
|
||||
- [x] Run backend/lease regressions, compile/diff checks, commit on codex/review-native-backend.
|
||||
|
||||
## PR #11/#12
|
||||
|
||||
- [x] Forward-merge backend into UI, then UI into residual branch; no history rewriting.
|
||||
- [x] Test one unreadable process/thread not affecting another, without fabricated modal windows; cover preview and action-time rechecks.
|
||||
- [x] Enumerate only target-process threads/windows, store incomplete-read metadata per PID. Keep unknown/active writers protected rather than adding a blind force override.
|
||||
- [x] Persist window identities and at most a 4 KiB output excerpt, preserve full preview in memory, stop duplicating activity output.
|
||||
- [x] Carry exact preview block scope into native Cancel and recheck identity/scope before clicking.
|
||||
- [x] Run residual/UI regressions, compile/diff checks, commit on residual branch.
|
||||
|
||||
## Chain tip
|
||||
|
||||
- [x] Merge residual fixes into PR #13, preserving ca39fb3 and icon.
|
||||
- [x] Address #11's line-ending note once at the tip: application.py to LF; pin it and main_window.py with targeted .gitattributes exceptions. Preserve all other file endings and the global * -text rule; EditorConfig is unnecessary.
|
||||
- [x] Independent review, integrated full suite, compile/diff checks, validation records and fast-forward pushes to existing PR branches.
|
||||
- [x] Update PR descriptions with precise results and no new package/native acceptance. Leave #3 as historical umbrella, without merging or closing it.
|
||||
@@ -1,32 +0,0 @@
|
||||
# PR #13 comment 319: residual lifecycle fixes
|
||||
|
||||
**Goal:** Fix the P2 and three P3 findings against head `96e179b` without interrupting an in-flight native writer.
|
||||
|
||||
**Scope:** https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/13#issuecomment-319
|
||||
|
||||
**Constraints:** Python 3.12/PySide6/pywin32, no new dependencies; existing isolated worktree and icon retained; no automatic ICDB Repair, native process termination, merge, release or issue closure. Real Mentor and shared-network acceptance remains outstanding.
|
||||
|
||||
## 1. Release proof and queue state
|
||||
|
||||
- [x] Reproduce an ended UNCONFIRMED observer leaving its library unavailable after explicit successful release.
|
||||
- [x] Snapshot retained entries before proof; acknowledge only those entries, for the matching library, while proof handles are still held. Failed proof and newer handoffs remain blocked. Test independent libraries and queue resumption.
|
||||
- [x] Retain final observer states for the existing residual panel, including unreadable journals; expose fresh recheck through that panel.
|
||||
|
||||
## 2. Passive discovery
|
||||
|
||||
- [x] Test that discovery of an exited session never calls release proof or modifies library checkpoints.
|
||||
- [x] Separate process observation from explicit reconciliation; startup observation stays read-only, reports ACTIVE/UNCONFIRMED and cannot claim RELEASED without proof.
|
||||
- [x] Refresh journal/status information from the running residual dialog, keeping all I/O off the Qt thread.
|
||||
|
||||
## 3. Supervisor loss
|
||||
|
||||
- [x] Use harmless real subprocesses to test PRECALL/POSTCALL exit, NATIVE_CALL/CLOSING retention, missing/unreadable journals and failed cancellation/journal writes.
|
||||
- [x] Synchronize phase transitions and helper registration with watchdog shutdown. Only matching durable and in-memory non-pending state allows worker-only exit; preserve active helpers and unknown states. Prevent subsequent calls after supervisor loss.
|
||||
- [x] Recheck after retained calls return; do not kill a native child or interpret worker exit as release proof.
|
||||
|
||||
## 4. Dead code and validation
|
||||
|
||||
- [x] Delete unused `_terminate_pid`; replace obsolete test hooks with assertions at actual process termination boundaries.
|
||||
- [x] Run focused regressions, full Python suite, compileall and diff checks. Record results and field-validation limits, then commit scoped changes. Do not rebuild or publish a candidate without documenting its source and validation.
|
||||
|
||||
Execution: implement inline in the existing isolated worktree; red/green tests per task. The user has authorized these fixes, so no further plan confirmation is needed.
|
||||
@@ -1,13 +0,0 @@
|
||||
# 占用范围、释放及原生确认实施计划
|
||||
|
||||
按用户已确认的误判复核方案执行,沿用隔离分支 codex/runtime-lifecycle-safety;原工作区和其他软件会话不改动。
|
||||
|
||||
1. 先以真实外部命令回放补充失败测试:未知外部观察项不接收关闭请求,目标独占资源证明成功后不阻止本库释放;真实本库进程、在途助手、数据库句柄或地址仍阻止。统一库证明与维护入口的进程候选判断,保留观测证据。
|
||||
2. 修正释放结果:观察项与可操作目标分开,未允许且自然退出不计主动释放;对绑定身份已退出的旧 UNCONFIRMED 日志不再认定调用仍在执行。覆盖 PID 复用和读取失败。
|
||||
3. 单项失败后,先尝试本库/本工程新鲜释放证明;证明完成才解除相应保留状态并继续,无法证明的共享占用仍停止相关写入。普通校验/管理在完整单项事务结束后让出队列,支持等待及取消。
|
||||
4. 普通 PCB 打开接通精确读写提示的用户确认;复用现有异步选择模型,绑定 PID、工程、私有桌面、当前提示,取消/跳过不自动写入。自动 Repair 保持关闭;恢复副本也传递用户选择。识别未知提示不猜测点击。
|
||||
5. 每项先红后绿;全量回归、编译、冻结代码/图标一致性;其他软件独立工程持续运行、真实目标句柄占用、停止后重试、提示确认/取消、真实校验与备份恢复。EDIF 崩溃单独保留原生失败证据,不跳过身份校验。尚未达到 READY 不宣称验收通过。
|
||||
|
||||
主要代码:library_lock.py、residual_sessions.py、session_record.py、verify_runner.py、management.py、ui/icdb_check_task.py、ui/management_dialog.py、ui/main_window.py、ui/residual_release_dialog.py、backup_recovery.py;原生确认按现有 pcb_restore_prompt 和 dialog_agent 模式实现。
|
||||
|
||||
验证记录写入 docs/releases,原始运行证据放 F 盘独立验收目录。开发与原生验收串行执行,所有原生操作局限隔离副本。
|
||||
@@ -1,79 +0,0 @@
|
||||
# 工单 #15 实测问题全量修复实施计划
|
||||
|
||||
**Goal:** 消除误阻塞,打通手动修复与版本管理,逐项验证工单全部实测问题。
|
||||
**Architecture:** 复用会话记录、串行队列和原生适配器;区分任务执行、客户端退出、协调租约释放、数据待恢复及下一项写入资格。范围不明时只隔离受影响资源,不冻结界面或无关库。
|
||||
**Tech Stack:** Python 3.12、PySide6、pywin32、Mentor EE7.9.5,不新增依赖。
|
||||
**Spec:** 用户在聊天中批准的五节计划;证据及确认/待确认边界见 `F:/CbbIssue15-20261116/analysis.md`。
|
||||
|
||||
## Global Constraints
|
||||
|
||||
- 基线 efb8cae,独立分支 codex/issue15-runtime-unblock;保留原脏工作区。
|
||||
- 自动 ICDB Repair 继续关闭。明确不一致时报告并跳过,提供实际可用的手动 Repair/历史恢复入口。独立项继续。
|
||||
- 普通校验确认工程唯一归属后,将主 PRJ 和 PCB PRJ 对齐所选中心库,保留原文件证据;ICDB 检查不修改引用。
|
||||
- READY 不进入校验/维护;管理允许 READY。原生写入串行,同名更新 Remove→Add 不被打断。
|
||||
- 手动备份政策;不新增自动整库备份。不手删原生锁/地址,不杀用户程序,不抢前台鼠标。
|
||||
- 默认确认 3 秒:已提交执行继续;未知占用/PCB 读写确认跳过项;历史版本最后手动保存;退出前保存;强制终止取消。人工优先、仅生效一次。
|
||||
- VerifyRequest/VerifyResult 与旧记录兼容。未知旧记录重新核对,不直接采信旧证明。
|
||||
- 先失败复现再最小修复,阶段验证后单独提交。源码回归不冒充冻结包或现场原生验收。
|
||||
- 验收只用隔离完整副本;不改生产库。未复现原故障必须明确。不得自动合并发布或关闭工单。
|
||||
|
||||
## Task 1: 会话资源范围、锁与释放证明
|
||||
|
||||
Owned areas: library_lock/session_record/icdb_ownership/operation_lifecycle/residual_sessions/owner_probe and a bounded file-probe helper/CLI if needed; associated tests. Coordinate shared changes through controller.
|
||||
|
||||
- [ ] 先新增行为回归并见证失败:A 退出而 B 有地址;未知检查点+明确其他工程进程;父句柄保留后子进程获取;迟到观察不能清除新任务;慢 A 探测不挡 B 内存/租约检查。
|
||||
- [ ] 在现有会话和释放证明中增补可选 lease_state/resource_scope/blocked_resources/data_recovery_required,记录目标工程、数据库、实际共享依赖和操作身份;旧记录缺范围重新核对。
|
||||
- [ ] 分开客户端退出、协调租约释放和数据恢复;已退出任务不因为其他块地址永久占有自己的句柄。不将文件存在/PID文本/地址年龄/端点不可达当作权威占用或可写证明。
|
||||
- [ ] release_residual_sessions 传递准确范围;观察项不进入关闭目标、不增加主动释放计数。未知检查点也按实际资源判断,不要求全部 Mentor 进程退出。
|
||||
- [ ] 地址不手动删除;有地址且需判定的目标复用 inspection-only 原生判定。真实目标占用/未返回共享写入依旧保护,健康工程不跑额外 ICDB 扫描。
|
||||
- [ ] 全局锁只保护快照/提交;进程/文件/网络探测移出锁,提交前核对 lease/operation 身份。
|
||||
- [ ] 有阻塞风险的只读文件探测放独立 helper,默认单次最多10秒,支持停止;只能终止纯探测 helper。需要持有证明句柄跨提交时使用握手保持保护,不引入无保护 TOCTOU。
|
||||
- [ ] 相关旧回归及真实 Windows 句柄/父子进程试验通过,写阶段记录并提交。
|
||||
|
||||
## Task 2: 取消、超时、退出与批次继续
|
||||
|
||||
Owned areas: failed_session/verify_runner/desktop_worker/operation_queue and lifecycle integration/tests. UI adoption delegated to Task 4.
|
||||
|
||||
- [ ] 失败用例覆盖晚到每日提示、读写确认、历史版本取消、PCB先退/启动器后退、COM无文档、慢探测、失败后独立项继续、取消后的新任务。
|
||||
- [ ] 正常执行和失败启动收尾复用已知弹窗识别。精确绑定创建身份、工程、私有桌面;未知弹窗不猜按钮。取消收尾最多30秒返回终态或交给独立观察。
|
||||
- [ ] 现有队列增补每批不可变任务上下文(operation_id、library/aliases、targets/resources、stop、state),停止事件不跨任务复用;原生写保持串行,事务不能在Remove与Add间让出。
|
||||
- [ ] 仅资源相关项受保护;安全业务失败继续,未确认范围的后续项记录跳过并结束汇总,不无限等待。回调绑定任务身份,不覆盖新库。
|
||||
- [ ] 准备有界关闭接口:30秒内完成或把原生事务交给有证据监督,禁止线程池析构/文件探测导致无限等。启动和交接记录保障重启可见,不重放写操作。
|
||||
- [ ] 运行覆盖测试并提交;向 Task 4 明确队列状态、停止和关闭接口。
|
||||
|
||||
## Task 3: 版本管理、手动 Repair、工程身份和原生错误
|
||||
|
||||
Owned areas: native_backup/mentor_adapter/library_manager_verify/verify diagnostics/maintenance_entry/native occupancy; may amend runner stage integration after Task 2.
|
||||
|
||||
- [ ] 先写失败测试:版本 worker 前的父保留租约、子启动/登记失败、无备份、关闭再打开、主/PCB引用不同、旧日志不作新诊断、菜单返回但没PCB。
|
||||
- [ ] 版本启动前复核本任务历史租约;使用已有登记/启动门控,先持久登记身份再开原生工具,执行方持实际租约,失败给明确归属与恢复路径。
|
||||
- [ ] 提供绑定准确PRJ/数据库的原生 Repair 入口,保留版本与备份UI;自动Repair关闭。不得绕过活跃事务;数据待恢复本身不得禁用手动恢复入口。
|
||||
- [ ] 普通校验以同一工程归属确认统一两层PRJ,保留编码/原字节;诊断不修改。重新核对实际打开身份。
|
||||
- [ ] 从本轮增量日志提取副本不一致/ICDB/失联及目标DB;只报告“发现问题、未修复”,独立项继续。
|
||||
- [ ] LM派发观察上限min(45秒,用户超时),有PCB再进入正常启动计时;无PCB快速失败并正常收尾,默认不启用前台鼠标替代。
|
||||
- [ ] 保存成功、关闭、资源释放、权威READY独立记录。仍PENDING不得记通过;历史恢复是版本待核对,原生窗口关闭不冒充Repair成功。
|
||||
- [ ] 相关回归与可用的隔离原生路径通过,记录后提交。
|
||||
|
||||
## Task 4: UI、输入、计数与无人值守集成
|
||||
|
||||
Owned areas: ui/main_window/child dialogs/library_reader/models/application settings and queue adoption; associated tests.
|
||||
|
||||
- [ ] 先复现排队禁用全界面、首次读库无法取消、迟到跨库回调、模态结果、证据按钮条件错误、坏库输入和计数问题。
|
||||
- [ ] 接 Task2 上下文,每任务独立停止/回调。排队不置全局不可操作;搜索筛选、换库、证据、取消排队、释放可用。原生操作排队,重复提交同一快照不重复执行。
|
||||
- [ ] 读库失败保留旧表并标失效,禁止旧表写;快速显示目录结果,原生目录复核后台入队。目录发现/原生记录/缺工程分别计数,未复核显示未知。
|
||||
- [ ] 空文件、错误后缀、锁路径是目录、权限失败输出稳定分类;快速读不自称验证了原生格式。
|
||||
- [ ] 结果QMessageBox显式NonModal、3秒默认关闭,失败/取消有证据即可打开;日志入口打开logs。记忆上次成功读取路径,启动仅回填不自动执行。
|
||||
- [ ] 版本/Repair按钮绑定一个可见非READY目标,不能以未校验或数据待恢复直接禁用;真实资源冲突有简短原因。
|
||||
- [ ] 全面复核选择/清空/隐藏项、READY资格、状态刷新、每个条件按钮。现有3秒策略完整集成,人工抢先选择/窗口隐藏/计时竞态不得重复动作。
|
||||
- [ ] 关闭接Task2有界交接;UI只留必要操作/错误,不写开发说明。
|
||||
- [ ] 全部相关Qt测试和381/3000项响应检查通过,记录后提交。
|
||||
|
||||
## Task 5: 全量回归、真实冻结包验收与PR
|
||||
|
||||
- [ ] 全量pytest、compileall、diff检查、模块/资源/PE图标与冻结包一致性;每次失败保留,修订后重验相应范围。
|
||||
- [ ] 逐按钮清单覆盖主窗口、管理、恢复、原生版本/Repair、释放及所有条件按钮;源码Qt与最终冻结包分别执行。
|
||||
- [ ] 非规则点击覆盖双击执行、取消重试、检查中排队/换库、隐藏勾选、结果框存在、关闭原生窗口、3秒边界竞争和主程序退出重启。
|
||||
- [ ] 真实Windows进程/文件锁覆盖无持有LOCK、父子冲突、外部无关进程、真实目标独占句柄、地址残留和慢/失败查询。不能修改或终止其他任务。
|
||||
- [ ] Mentor真实独立副本验证普通校验READY、ICDB批检后独立继续、手动Repair、版本回退后重开、批量新增/同名更新/移除/恢复;原生失败单独列明,不用模拟替代。
|
||||
- [ ] 不一致故障必须对应实际原生特征;没有现场一致副本则标未复现,不拿格式损坏替代。Win10/生产网络未测明确保留。
|
||||
- [ ] 候选包、逐问题/逐按钮验收表、新PR。未经现场验收不自动合并发布、不关工单。
|
||||
@@ -1,7 +1,5 @@
|
||||
# CBB 批量状态桥设计
|
||||
|
||||
Current behavior (2026-11-09): production status scans always query the bridge fresh and overwrite checkpoint evidence. `BatchStatusSession.scan` defaults to `resume=False`; `resume=True` remains an explicit low-level option for controlled read-only scans, not an exposed production resume feature. Its lightweight fingerprint cannot detect every native payload/database write, so saved READY/PENDING rows must not authorize production actions.
|
||||
|
||||
## 目标
|
||||
|
||||
支持对 180 到 3000 个 CBB 进行 Mentor authoritative Verify 状态读取,要求单条失败隔离、过程可恢复、结果可审计,并避免现有“一条 CBB 启动一个桥进程”的启动开销。
|
||||
|
||||
@@ -1,201 +0,0 @@
|
||||
# CBB 原生操作生命周期与只读边界设计草案
|
||||
|
||||
状态:用户已批准并授权实施。运行时实现与验证见同日计划和候选记录;不代表现场 ICDB 恢复验收。
|
||||
|
||||
范围已由用户确认:三条 P1,加上直接相关的停止与状态记录问题。
|
||||
|
||||
代码基线:`5eb4b2d7ed09947f19310ba80ba3b9a2a09b6f7d`。审查来源:[PR #12 评论 297](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/12#issuecomment-297)。评论分析的是旧 `dc536da`;以下结论重新对照当前基线,不把旧评论当作最新提交的复审。
|
||||
|
||||
## 1. 要解决的实际问题
|
||||
|
||||
1. 用户停止、超时、失败清理和监督器失联可经不同路径结束保存 helper。杀掉调用 `doc.Save()` 的 cscript 后,退出查询又可能将它描述为已安全释放。
|
||||
2. 管理工作进程缺少统一的监督器失联处理和可跨重启核对的会话记录。新增路径已有 `_require_add_supervisor`,但 catalog、remove、COM 等待和收尾覆盖不一致。
|
||||
3. legacy 状态读取会启动私有桌面的 LM,并调用偏向肯定按钮的通用弹窗处理器。默认权威桥路径没有这项图标读取回退,不能把风险泛化成所有读取都会执行它。
|
||||
|
||||
本轮修复停止与监督行为,不能据此宣布现场 ICDB 失联已修好,或推断已经验证了保存中断的数据后果。
|
||||
|
||||
## 2. 方案比较与选择
|
||||
|
||||
| 方案 | 代价与限制 | 选择 |
|
||||
| --- | --- | --- |
|
||||
| 按异常逐处增加判断 | 改动初期较少,但用户停止、finally、kill、watchdog 容易再分叉;不能解决重启后的身份核对 | 不采用 |
|
||||
| 小型事实模型、按原生阶段停止、复用现有队列和租约 | 集中约束危险动作,同时保留现有串行操作、后台检查和确认入口;可分三个交付单元审查 | 推荐 |
|
||||
| 重写调度与自动化框架 | 改动大,可能重新引入阻塞,且难以定位回归 | 不采用 |
|
||||
|
||||
本轮只增加保存事实解析和受限会话记录两个小模块,不引入通用流程引擎、任务总线或新依赖。
|
||||
|
||||
## 3. 全局约束
|
||||
|
||||
- 技术栈保持 Python 3.12、PySide6、pywin32、Mentor EE7.9.5,不增加运行时依赖。
|
||||
- 检验、ICDB 批量检查、中心库管理保持独立;ICDB 自动 Repair 继续关闭。
|
||||
- READY 条目继续排除维护;状态读取失败不伪造 READY,也不直接判定 ICDB 损坏。
|
||||
- 自动停止、超时、失败清理、监督器失联都不得强杀可能正在原生写入的进程或 COM 保存 helper。
|
||||
- UI、搜索、筛选、日志查看和只读浏览保持可用;一个未释放写入不得占着全局执行票据等待无限长时间。
|
||||
- 同库仍在进行的写入不可并发启动;已释放的单项失败不得阻止独立项,其他独立库可排队获得执行机会。
|
||||
- 历史 JSON 只触发身份及实际资源复核,不直接构成真实占用;报告错误不得伪造占用或永久禁用入口。
|
||||
- 不自动选择历史版本、重新导入、恢复备份、删除原生锁/地址文件或修改 LMC 伪造状态。
|
||||
- 不新增全库自动备份或全库内容哈希;此前确认的人工备份策略不变。
|
||||
- 确认结束客户端与正常停止分开;本轮不增加“放弃正在进行的保存”按钮,不自动放宽服务器保护。
|
||||
- 原生动作、证据读取、路径解析、进程查询和重启核对都放在非 GUI 线程;GUI 只更新视图和提交用户意图。
|
||||
- 保留 VerifyRequest / VerifyResult 的现有参数及 safe_to_continue 兼容性,只追加有默认值的事实字段。
|
||||
- 保持原有文件行尾,不进行与功能无关的整文件规范化。
|
||||
- 开发验证只使用临时数据、模拟原生边界或隔离副本;不在生产库制造保存中断。
|
||||
|
||||
## 4. 保存、关闭和释放分开记录
|
||||
|
||||
新增 `operation_lifecycle.py`,提供纯函数,不导入 Qt、COM 或管理模块。
|
||||
|
||||
`classify_save_state(markers, *, helper_exited, native_released, forced=False)` 返回:
|
||||
|
||||
| 字段 | 值 | 能证明什么 |
|
||||
| --- | --- | --- |
|
||||
| save_state | NOT_STARTED / COMMITTED / REJECTED / UNKNOWN | COMMITTED 只来自本次 helper 的 SAVE_OK;缺标记不能推断“没有写入” |
|
||||
| close_state | CLOSED / FAILED / UNKNOWN | 只由本次 CLOSE_OK / CLOSE_FAILED 明确记录;退出码不替代关闭证据 |
|
||||
| helper_state | EXITED / RUNNING / UNKNOWN | 来自精确进程句柄或身份核对;PID 消失不证明保存完整 |
|
||||
| resource_state | RELEASED / RETAINED / UNKNOWN | 来自独立资源证明;与保存成功分开 |
|
||||
| interrupted | bool | 记录异常结束,不用进程消失掩盖中断 |
|
||||
| detail | str | 说明证据缺失、矛盾或中断的具体原因;正常结果为空字符串 |
|
||||
|
||||
SAVE_OK 表示原生 Save 返回成功,不表示工程内容、中心库权威状态或历史版本已验收。关闭失败时仍保留已取得的保存事实。证据读取失败保留 UNKNOWN,不自动将 save_state 改为 REJECTED。
|
||||
|
||||
运行中的事实只能由当前操作 nonce、helper 身份和新日志更新;不拼接上轮 save.log。发生矛盾时采用 UNKNOWN 并保留原始标记。
|
||||
|
||||
新增兼容字段 `VerifyResult.write_outcome: dict | None = None`、`VerifyResult.session_record_path: Path | None = None`;现有 release_proof 含义不变。
|
||||
|
||||
safe_to_continue 继续表达本任务是否已释放后续原生执行所需资源,不能表达保存已通过。若保存结果未知但资源已独立证明释放,结果保留失败/待核对,允许其他独立项;同一目标不自动重放。若当前仍有原生写入,只保留相关库的写入限制,不全局锁住应用。
|
||||
|
||||
## 5. 原生调用阶段与停止语义
|
||||
|
||||
原生调用使用以下最小阶段:PRECALL、NATIVE_CALL、POSTCALL、CLOSING、RELEASE_CHECK、FINISHED、UNCONFIRMED。保存 helper 启动但本轮阶段缺失时视为可能进入 NATIVE_CALL,不能据此终止。
|
||||
|
||||
| 当前事实 | 用户停止/超时后的行为 | 后续项 |
|
||||
| --- | --- | --- |
|
||||
| 原生调用尚未发出且身份已确认 | 取消启动,不再进入新的原生动作;正常释放已创建的辅助资源 | 用户取消的批次不再启动后续项 |
|
||||
| Save/Close/管理 COM 写调用可能仍在进行 | 写停止意图,继续观察调用返回;不杀 helper、worker、PCB 或服务器 | 同库写入等待;UI 和独立库继续可用 |
|
||||
| Save 已返回,文档未关闭 | 记录 COMMITTED 或 REJECTED;仅对身份一致、已确认可正常关闭的文档执行现有正常收尾 | 无新 Save,不自动放弃未保存修改 |
|
||||
| 原生调用已返回,资源已释放,但单项失败 | 保存失败及证据,保持同目标待核对,不自动重放 | 非用户取消批次可继续独立项 |
|
||||
| 无法确认调用是否返回或身份变化 | 留存原始证据,转后台观察/人工处理;不猜测已退出或强制结束 | 只限制无法确认的相关库写入 |
|
||||
|
||||
5 秒用于普通合作式停止的短等待。进入原生写入后的前台任务最多再等待 120 秒;该时长只是转后台观察的界限,不是终止进程的时限。后台观察使用独立工作线程/任务,不占 GUI 线程,不占 NativeQueue 的全局 action 票据。
|
||||
|
||||
必须在后台观察交接完成、关联库租约及会话记录保存后,才能释放原执行票据。若交接存储失败,保留内存监督并提示记录错误;不得因此调用 kill,也不得声称释放完成。
|
||||
|
||||
同库后台写入的独占由现有 LibraryLock / retained lease 约束,其他库仍通过既有串行通道运行。不能解除另一个活跃写入者的文件锁;合作锁也不能宣称约束了别的工程师直接打开 Mentor。
|
||||
|
||||
观察循环优先使用已打开进程句柄的零等待查询,不每秒重跑整库扫描或完整 WMI。等待时不得持有 `_guard` 或全局原生互斥;只有候选会话退出后才尝试独立释放证明。证明通道正忙则延后观察,不将其当作新的库故障,不挤占其他库的执行机会。
|
||||
|
||||
用户取消批次后不自动恢复该批次。后台释放确认可以解除匹配会话状态,但后续写入仍来自已经排队的独立请求或用户新的操作,不能重放历史写入。
|
||||
|
||||
## 6. 保存 helper 与所有退出路径一致
|
||||
|
||||
- `_stop_worker`、`DesktopWorker.kill`、`stop_automation_clients`、`close`、verify watchdog 和失败 finally 使用同一阶段判据。不能只修用户停止按钮。
|
||||
- 终止许可必须是已证明没有原生写调用的精确辅助进程;缺阶段、缺身份、helper 日志不可读都不是终止许可。
|
||||
- 已启动保存时,worker 不再仅因取消文件出现就放弃监督。先等当前 COM 返回,再决定正常关闭或保留原生提示。
|
||||
- VBS 在首次 Save 前检查取消。Save 返回后写 SAVE_OK / SAVE_REJECTED,再进行只读后置核对及有条件正常收尾;不让取消检查丢掉已经返回的保存事实。
|
||||
- VBS 对 Save/IsSaved/后置同步/Close 分别记录阶段和明确失败原因。接触这些调用的错误处理必须是局部检查,不用一个覆盖整份脚本的 On Error Resume Next 掩盖失败。
|
||||
- Close(True) 若仍可能写入,同样属于受保护原生调用;不得因 Save 已成功就强杀正在 Close 的 helper。
|
||||
- 父进程意外退出与用户停止采用相同的“停止新动作、观察现有调用”原则。现有 `stop_clients=True` 不能绕过保存保护。
|
||||
- 本轮不提供自动强制放弃保存。已有人工释放入口若遇到本工具明确登记的活跃 Save/Close,要显示实际阶段,不能把它当普通僵死客户端。
|
||||
|
||||
## 7. 可跨重启核对的会话记录
|
||||
|
||||
新增 `session_record.py`,只处理本工具受控的库外任务记录。它不执行 UI 操作,不从记录读取命令再运行,不依据文件存在就判占用。
|
||||
|
||||
每个会话记录:protocol/version、operation_id、operation、library、block、原生阶段、supervisor/worker/helper/native 的 PID/创建时间/完整映像、当前用户 SID/Windows 会话、desktop、取消文件、证据位置、原生调用是否可能仍在进行、保存/关闭/释放事实、记录时间和观察结果。
|
||||
|
||||
有可能新建原生进程时,先记录启动意图;CreateProcess 后记录精确身份。监督器打开工作进程的句柄后,工作进程才能获准进入原生动作;避免 GUI 在首条记录之前消失的空窗。
|
||||
|
||||
每个操作目录的 `session.json` 由启动方记录不可变身份;`worker-state.json` 只由 worker 写,`supervisor-lost.json` 只由 watchdog 写,后台观察写自己的 `observation-<observer_id>.json`。不能让多个进程覆盖同一状态文件。保存 helper 增加启动门:Python 写入 helper 精确身份后才放行进入 COM;取消、启动方消失或 30 秒内没有放行时,在 COM 调用前退出。旧测试直接运行 VBS 的无门参数模式只作兼容测试,生产启动必须使用门。
|
||||
|
||||
不按桌面名前缀批量删除桌面,不按旧 PID 杀进程。重启时:
|
||||
|
||||
1. 后台读取受控目录内受认可协议的记录,限制大小并拒绝目录链接和越界证据路径。
|
||||
2. 精确核对当前进程创建时间、映像和用户/Windows 会话;PID 复用记为 IDENTITY_CHANGED,不对替代进程做动作。
|
||||
3. 身份一致且仍活跃的会话显示原生阶段、输出和已有保存/取消选项;不自动继续写操作。
|
||||
4. 进程确已退出后仍调用现有资源释放证明;确认后归档会话记录并刷新相关视图。
|
||||
5. 未知记录只显示无法确认的原因和重新检查入口,不因为一份损坏 JSON 永久禁止所有操作。
|
||||
|
||||
CloseDesktop 只关闭本工具持有的句柄;原生进程或窗口仍引用桌面时,不宣称桌面已删除。不得把“清理桌面”作为结束正在写库进程的借口。
|
||||
|
||||
## 8. 管理 worker 的监督与取消
|
||||
|
||||
复用 `_require_add_supervisor` 的阶段检查思路,为 catalog/add/remove 都设置 supervisor identity、统一取消文件和阶段记录,而不是在管理入口外加一个无限等待。
|
||||
|
||||
- PRECALL:监督器失联或取消后,不再启动 LM、导入器、移除命令或下一阶段。
|
||||
- NATIVE_CALL:watchdog 只记录失联和停止意图;COM 或外部 CleanWGLib 调用仍在进行时不强制退出其调用进程。
|
||||
- POSTCALL:不得因为上一调用返回成功就继续 update 的下一次 add 或其他后续写入。关闭已确认空闲的自有原生会话,未知弹窗保留并暴露。
|
||||
- update 的 remove 成功而 add 未提交时返回“部分完成/需恢复”,保留该目标检查点,不把它报成纯取消,也不重新导入。
|
||||
- 正常完成和超时记录都能在重启后独立核对;不再仅依赖 `_retained_workers` 内存列表和 worker 自己写出的单个 safe_to_continue。
|
||||
|
||||
watchdog 不能解决不可取消 COM 调用的所有平台限制。验收要求是不再有无记录、无观察、可继续执行新写入的孤儿自动化;不承诺任意卡死的原生进程都能自动安全退出。
|
||||
|
||||
## 9. 状态读取的默认边界
|
||||
|
||||
推荐默认:普通读取不为 legacy 图标探测自动启动 LM,也不自动应答原生弹窗。
|
||||
|
||||
优先使用当前权威状态桥;桥不可用或无可观察的既有 LM 时,条目返回现有 UNKNOWN / UNAVAILABLE 及具体原因。无法查询不能等同于已知 PENDING,更不能等同于 ICDB 损坏。
|
||||
|
||||
`scan_open_library_status` 可以只观察用户已经打开、库身份匹配的 LM 树,不点任何按钮,不替用户关闭该 LM。发现模态提示时返回无法确认并保留可查看的提示信息。
|
||||
|
||||
`read_library_flag` / `read_library_tree_image_map` 的兼容 API 也必须服从上述边界,不能让隐藏直接调用继续启动生产库 LM 并走通用肯定按钮策略。需要自动创建 LM 的旧诊断能力不属于本轮交付;明确的用户“打开原生工具”入口保持原用途。
|
||||
|
||||
不能为了禁止状态读取自动点击,粗暴更改所有验证流程的已验证弹窗白名单。按调用目的分开,读取路径绝不调用肯定优先/fallback 操作器。
|
||||
|
||||
## 10. 批次与停止信号
|
||||
|
||||
GUI、CLI run_batch、ICDB 后台检查将 stop 传入同一请求链。兼容 auto_repair 分支补齐 stop 传播,但默认仍为关闭,不能把兼容性测试当作重新启用修复的授权。
|
||||
|
||||
队列取消、当前调用待返回、当前项失败和资源未释放分别记录。不能通过给全局 stop Event 置位,把一个库的观察状态扩散为所有独立库都停止。
|
||||
|
||||
本轮不把 Condition 改成无超时等待,除非所有取消/ready 变化都已有可靠通知;避免修复停止时引入永久等待。
|
||||
|
||||
## 11. 测试与验收
|
||||
|
||||
### 必须通过的跨组件场景
|
||||
|
||||
| 场景 | 必须观察到的结果 |
|
||||
| --- | --- |
|
||||
| Save 前取消 | Save 未调用;无新原生写入 |
|
||||
| Save 调用中取消、超时、未知弹窗或父进程退出 | helper 存活、没有强杀调用;停止意图与当前阶段已记录 |
|
||||
| Save 返回成功、Close 卡住 | 保存为 COMMITTED,关闭未确认;不得报无写入或全部完成 |
|
||||
| helper 突然退出且没有返回标记 | 保存 UNKNOWN,原生释放另行核对;不能因进程消失报安全保存 |
|
||||
| 前台等待超过 120 秒 | 转后台观察;UI 和独立库任务可运行,同库写入不能并发 |
|
||||
| 管理 GUI 在 catalog/add/remove/update 两阶段之间退出 | 无新动作越过停止边界;已发生动作、待核对范围和精确会话身份可恢复显示 |
|
||||
| 重启后 PID 复用、记录损坏或报告保存失败 | 不杀替代进程,不重放操作,不制造全局永久锁 |
|
||||
| 权威桥不可用、LM 没打开 | 状态无法确认;没有 CreateProcess、恢复/覆盖/肯定点击 |
|
||||
| 既有 LM 出现未知/修复/覆盖/保存提示 | 只观察并返回 UNKNOWN,不点击、不关闭用户会话 |
|
||||
|
||||
使用真实 cscript + 替换外部 COM 创建的 VBS harness 验证保存顺序;使用临时 sleep/helper 进程验证父进程退出、超时和进程身份;不在生产 Mentor 中途保存时做破坏试验。
|
||||
|
||||
全量 Python 测试必须串行运行,测试互斥使用独立命名空间,恢复临时根与源库分离;编译检查、diff 检查和 frozen helper 入口冒烟完成后才描述候选程序。冻结包先在 fake 原生边界跑同一保存/停止场景。
|
||||
|
||||
真实 Mentor 仅在一致隔离副本做延迟保存、当前原生取消、正常收尾、重新打开与权威状态核对;Win10、网络共享库、跨机器并发分别记录,缺环境时保留未验收项。
|
||||
|
||||
## 12. 分阶段交付和停止条件
|
||||
|
||||
交付单元 A:保存事实、helper/worker 停止规则和有界等待交接。
|
||||
|
||||
交付单元 B:管理 worker 的失联、取消、持久记录和重启核对。
|
||||
|
||||
交付单元 C:legacy 只读边界、GUI/CLI 停止接入、冻结包与隔离环境验收。
|
||||
|
||||
每个单元有独立回归和提交;三单元完成前不以局部通过宣称生命周期修复完成。原有 #10–#12 的旧评论不视为本轮新实现的批准。
|
||||
|
||||
实现从当前集成基线另开临时分支 `codex/runtime-lifecycle-safety`,不得覆盖原运行工作区,不 force-push 历史分支。执行时重新读取远端 PR/main 状态,按实际基线选择差分,避免重复合入已合并改动。先交付一个仅包含本轮运行时差分的草稿 PR,并在描述中按 A/B/C 给出审查顺序。
|
||||
|
||||
出现以下任一情况停止扩展并回到设计核对:没有办法在保留 COM 调用的同时交接观察、需要自动终止真实服务器、需要删除原生锁或地址才能让测试通过、需要引入新全局门禁才能规避身份不明。
|
||||
|
||||
## 13. 本轮明确排除
|
||||
|
||||
一般化跨机器写入互斥、全库/非目标工程内容证明、PRJ 重写与 before 字节补齐、UIA 无界线程整改、桥部署预检、CLI 全库范围确认、CI/打包外部路径/README 整理均单独排期。
|
||||
|
||||
其中与本轮直接相关的未知进程身份核对、停止传播及 Save/Close 事实拆分已纳入;不把排除项写成已修复。
|
||||
|
||||
## 14. 草案自查
|
||||
|
||||
- 三条 P1 均有明确生产调用点、拟修改边界和跨组件验收场景。
|
||||
- 没有把取消等同于强制结束,也没有把退出等同于保存成功。
|
||||
- 没有通过新增历史记录硬门禁解决问题;活动写入仍保持真实资源约束。
|
||||
- 没有依赖“调用 watchdog(stop_clients=False) 就万事解决”的错误假设。
|
||||
- 只读回退范围与权威桥路径区分;未知状态不伪造 READY/PENDING。
|
||||
- 用户已通过“按照当前的优化吧”授权实施;真实环境验收仍单独记录,不以测试计数代替。
|
||||
+1
-1
@@ -3,7 +3,7 @@ requires = ["setuptools>=84.1.0"]
|
||||
build-backend = "setuptools.build_meta"
|
||||
[project]
|
||||
name = "cbb-refresh-verify"
|
||||
version = "0.2.4b4"
|
||||
version = "0.2.4b1"
|
||||
requires-python = ">=3.12,<3.13"
|
||||
dependencies = ["PySide6>=6.7,<7", "pywin32>=306", "pywinauto>=0.6.9,<0.7", "Pillow>=13.0.0,<14"]
|
||||
|
||||
|
||||
@@ -1 +1 @@
|
||||
__version__ = "0.2.4b4"
|
||||
__version__ = "0.2.4b1"
|
||||
@@ -1,250 +1,151 @@
|
||||
from __future__ import annotations
|
||||
import argparse, os, sys
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
from typing import Sequence
|
||||
from .runtime_logging import configure
|
||||
|
||||
|
||||
@contextmanager
|
||||
def batch_stop_signals(stop):
|
||||
import signal
|
||||
previous = {}
|
||||
try:
|
||||
for name in ('SIGINT', 'SIGTERM', 'SIGBREAK'):
|
||||
signum = getattr(signal, name, None)
|
||||
if signum is not None:
|
||||
previous[signum] = signal.signal(signum, lambda *_: stop.set())
|
||||
yield
|
||||
finally:
|
||||
for signum, handler in previous.items():
|
||||
signal.signal(signum, handler)
|
||||
|
||||
|
||||
def configure_qt_application(app):
|
||||
"""Apply a predictable light palette across machines and Qt themes."""
|
||||
from PySide6.QtGui import QColor, QPalette
|
||||
|
||||
app.setStyle('Fusion')
|
||||
palette = app.palette()
|
||||
colors = {
|
||||
QPalette.ColorRole.Window: '#f5f6f8',
|
||||
QPalette.ColorRole.WindowText: '#202124',
|
||||
QPalette.ColorRole.Base: '#ffffff',
|
||||
QPalette.ColorRole.AlternateBase: '#eef1f5',
|
||||
QPalette.ColorRole.Text: '#202124',
|
||||
QPalette.ColorRole.Button: '#eef1f5',
|
||||
QPalette.ColorRole.ButtonText: '#202124',
|
||||
QPalette.ColorRole.Highlight: '#2f6fed',
|
||||
QPalette.ColorRole.HighlightedText: '#ffffff',
|
||||
QPalette.ColorRole.ToolTipBase: '#ffffff',
|
||||
QPalette.ColorRole.ToolTipText: '#202124',
|
||||
QPalette.ColorRole.PlaceholderText: '#6b7280',
|
||||
}
|
||||
for role, color in colors.items():
|
||||
palette.setColor(role, QColor(color))
|
||||
for role in (QPalette.ColorRole.WindowText, QPalette.ColorRole.Text, QPalette.ColorRole.ButtonText):
|
||||
palette.setColor(QPalette.ColorGroup.Disabled, role, QColor('#858b94'))
|
||||
app.setPalette(palette)
|
||||
app.setStyleSheet(
|
||||
'QWidget { color: #202124; }'
|
||||
'QTableWidget, QLineEdit, QTextEdit, QSpinBox { '
|
||||
'background: #ffffff; color: #202124; selection-color: #202124; }'
|
||||
'QHeaderView::section { background: #e9edf2; color: #202124; }'
|
||||
'QPushButton, QToolButton { color: #202124; }'
|
||||
'QPushButton:disabled, QToolButton:disabled { color: #858b94; background: #e3e6eb; }'
|
||||
)
|
||||
return app
|
||||
|
||||
def resolve_data_root(cli_value: Path | None) -> Path:
|
||||
if cli_value is not None: return cli_value.expanduser().resolve()
|
||||
if getattr(sys, "frozen", False): return Path(sys.executable).resolve().parent / "data"
|
||||
local = os.environ.get("LOCALAPPDATA")
|
||||
return (Path(local) / "CbbRefreshVerify" if local else Path.home() / "AppData" / "Local" / "CbbRefreshVerify").resolve()
|
||||
|
||||
def _positive_int(value):
|
||||
try:
|
||||
number = int(value)
|
||||
except ValueError:
|
||||
raise argparse.ArgumentTypeError('must be a positive integer') from None
|
||||
if number <= 0:
|
||||
raise argparse.ArgumentTypeError('must be a positive integer')
|
||||
return number
|
||||
|
||||
|
||||
def _native_worker_entry(mode, request):
|
||||
"""Contain hidden-worker failures so a frozen bootloader cannot show a modal error."""
|
||||
import contextlib
|
||||
import json
|
||||
import traceback
|
||||
from .desktop_worker import run_native_worker
|
||||
state = {'worker_entered': False}
|
||||
result_name = {'verify': 'outcome.json', 'repair': 'repair-result.json'}.get(mode, 'result.json')
|
||||
try:
|
||||
with request.with_name('worker.log').open('a', encoding='utf-8') as log:
|
||||
with contextlib.redirect_stdout(log), contextlib.redirect_stderr(log):
|
||||
if mode == 'native-backup':
|
||||
from .native_backup import run_native_backup_worker
|
||||
return run_native_backup_worker(request, admission_state=state)
|
||||
if mode == 'management':
|
||||
from .native_management import catalog_worker_main, management_worker_main
|
||||
job = json.loads(request.read_text(encoding='utf-8'))
|
||||
action = catalog_worker_main if job.get('worker_role') == 'catalog_readonly' else management_worker_main
|
||||
elif mode == 'repair':
|
||||
from .native_repair_ui import repair_worker_main
|
||||
action = repair_worker_main
|
||||
else:
|
||||
from .mentor_adapter import worker_main
|
||||
action = worker_main
|
||||
return run_native_worker(action, request, admission_state=state)
|
||||
except Exception as error:
|
||||
trace = traceback.format_exc()
|
||||
entered = state['worker_entered']
|
||||
reason = str(error)
|
||||
cancelled = not entered and reason.startswith('WORKER_CANCELLED:')
|
||||
detail = ('VERIFY_CANCELLED: ' if mode == 'verify' and cancelled else '') + reason
|
||||
path = request.with_name(result_name)
|
||||
try:
|
||||
result = json.loads(path.read_text(encoding='utf-8'))
|
||||
if not isinstance(result, dict): result = {}
|
||||
except (OSError, ValueError):
|
||||
result = {}
|
||||
if mode == 'verify':
|
||||
result.update(status='CANCELLED' if cancelled else 'FAIL', stderr=detail,
|
||||
error_stage='worker' if entered else 'admission', safe_to_continue=False)
|
||||
else:
|
||||
result.update(success=False, status='FAILED', detail=detail, safe_to_continue=False)
|
||||
failure = dict(stage='worker' if entered else 'admission', reason=reason,
|
||||
worker_entered=entered, native_started=None if entered or mode == 'native-backup' else False,
|
||||
safe_to_continue=False)
|
||||
# An exception is never a release proof, and existing Save/Close evidence is retained.
|
||||
for output, value in ((path, result), (request.with_name('worker-failure.json'), failure)):
|
||||
try:
|
||||
output.write_text(json.dumps(value, ensure_ascii=False, indent=2), encoding='utf-8')
|
||||
except OSError:
|
||||
pass
|
||||
try:
|
||||
with request.with_name('worker.log').open('a', encoding='utf-8') as log:
|
||||
log.write(trace)
|
||||
except OSError:
|
||||
pass
|
||||
return 2 if mode == 'management' else 1
|
||||
|
||||
|
||||
def main(argv: Sequence[str] | None = None) -> int:
|
||||
parser = argparse.ArgumentParser(prog="CbbRefreshVerify")
|
||||
parser.add_argument('--verify-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--repair-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--owner-probe', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--file-probe', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--native-backup-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--management-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--dialog-agent', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--collect-failure-logs', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--batch-lmc', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--block', action='append', default=[], help=argparse.SUPPRESS)
|
||||
parser.add_argument('--limit', type=_positive_int, help='Maximum requested CBB names for --batch-lmc (default: all)')
|
||||
parser.add_argument('--libspec', default='', help=argparse.SUPPRESS)
|
||||
parser.add_argument('--dms-login-config', default='', help=argparse.SUPPRESS)
|
||||
parser.add_argument('--mentor-bin', default='', help=argparse.SUPPRESS)
|
||||
parser.add_argument("--smoke-test", action="store_true", help=argparse.SUPPRESS); parser.add_argument("--data-root", type=Path, help=argparse.SUPPRESS)
|
||||
args = parser.parse_args(list(argv) if argv is not None else None)
|
||||
if args.file_probe:
|
||||
from .file_probe import file_probe_main
|
||||
return file_probe_main(args.file_probe)
|
||||
if args.owner_probe:
|
||||
from .owner_probe import owner_probe_main
|
||||
return owner_probe_main(args.owner_probe)
|
||||
if args.native_backup_worker:
|
||||
return _native_worker_entry('native-backup', args.native_backup_worker)
|
||||
if args.management_worker:
|
||||
return _native_worker_entry('management', args.management_worker)
|
||||
if args.repair_worker:
|
||||
return _native_worker_entry('repair', args.repair_worker)
|
||||
if args.collect_failure_logs:
|
||||
from .verify_diagnostics import failure_logs_main
|
||||
return failure_logs_main(args.collect_failure_logs)
|
||||
if args.dialog_agent:
|
||||
from .dialog_agent import dialog_agent_main
|
||||
return dialog_agent_main(args.dialog_agent)
|
||||
if args.verify_worker:
|
||||
return _native_worker_entry('verify', args.verify_worker)
|
||||
context = configure(resolve_data_root(args.data_root)); logger = context.logger; logger.info("application_start")
|
||||
try:
|
||||
if args.batch_lmc:
|
||||
from .verify_runner import (VerifyRequest, native_lm_verify_enabled,
|
||||
run_batch, write_batch_report, failure_report_path)
|
||||
from .library_reader import read_library_fast
|
||||
from .batch_status import authoritative_status_map
|
||||
from .network_path import LibraryPathLease, select_library_file
|
||||
with LibraryPathLease.acquire(args.batch_lmc) as lease:
|
||||
mentor_path = select_library_file(lease.mentor_path)
|
||||
logger.info(
|
||||
'library_path_lease display=%s mentor=%s drive=%s remote=%s created=%s',
|
||||
lease.display_path, mentor_path, lease.drive or '-',
|
||||
lease.remote_root or '-', lease.created)
|
||||
names = list(args.block)
|
||||
if not names:
|
||||
library = read_library_fast(
|
||||
mentor_path,
|
||||
status_reader=lambda path, names: authoritative_status_map(
|
||||
names, path, context.root/'status-scan.jsonl'),
|
||||
)
|
||||
if library.error: raise RuntimeError(library.error)
|
||||
names = [record.name for record in library.records if record.status != 'READY']
|
||||
if not names: raise RuntimeError('中心库未读取到需要校验的 CBB')
|
||||
total = len(names)
|
||||
if args.limit is not None:
|
||||
names = names[:args.limit]
|
||||
logger.info('batch_selection selected=%s total=%s remaining=%s limit=%s',
|
||||
len(names), total, total - len(names), args.limit or 'all')
|
||||
requests = [VerifyRequest(mentor_path, name, context.root/'evidence',
|
||||
libspec=args.libspec, dms_login_config=args.dms_login_config,
|
||||
mentor_bin=args.mentor_bin, logging_context=context,
|
||||
mapped_drive=lease.drive,
|
||||
mapped_remote_root=lease.remote_root,
|
||||
native_lm_verify=native_lm_verify_enabled())
|
||||
for name in names]
|
||||
def retain_mapping(reason):
|
||||
lease.retain_for_recovery()
|
||||
logger.warning(
|
||||
'batch_drive_retained drive=%s remote=%s display=%s mentor=%s reason=%s '
|
||||
'guidance=请打开此中心库的“释放残留会话…”入口,确认原生会话安全释放后再释放映射;'
|
||||
'原生写入仍可能运行时请保留映射。',
|
||||
lease.drive or '-', lease.remote_root or '-', lease.display_path,
|
||||
mentor_path, reason)
|
||||
try:
|
||||
from threading import Event
|
||||
stop = Event()
|
||||
with batch_stop_signals(stop):
|
||||
results = run_batch(requests, stop=stop)
|
||||
except Exception:
|
||||
retain_mapping('batch_exception')
|
||||
raise
|
||||
if any(not result.safe_to_continue for result in results):
|
||||
retain_mapping('native_release_unconfirmed')
|
||||
report = write_batch_report(requests, results, context.root/'reports')
|
||||
logger.info('batch_report path=%s', report)
|
||||
logger.info('failure_report path=%s', failure_report_path(report))
|
||||
code = 0 if all(result.status == 'PASS' for result in results) else 2
|
||||
logger.info('application_clean_shutdown exit_code=%s', code)
|
||||
return code
|
||||
from .ui.main_window import MainWindow, application_icon_path
|
||||
if args.smoke_test:
|
||||
os.environ.setdefault('QT_QPA_PLATFORM', 'offscreen')
|
||||
from PySide6.QtWidgets import QApplication
|
||||
app = QApplication.instance() or QApplication([sys.executable])
|
||||
configure_qt_application(app)
|
||||
window = MainWindow(logging_context=context); window.show()
|
||||
icon_path = application_icon_path()
|
||||
if icon_path.is_file():
|
||||
from PySide6.QtGui import QIcon
|
||||
app.setWindowIcon(QIcon(str(icon_path)))
|
||||
if args.smoke_test:
|
||||
from PySide6.QtCore import QTimer
|
||||
logger.info('gui_smoke_window_created title=%s', window.windowTitle())
|
||||
QTimer.singleShot(250, app.quit)
|
||||
code = int(app.exec()); logger.info("application_clean_shutdown exit_code=%s", code); return code
|
||||
except Exception: logger.exception("application_startup_failure"); return 1
|
||||
finally:
|
||||
for handler in logger.handlers: handler.flush()
|
||||
from __future__ import annotations
|
||||
import argparse, os, sys
|
||||
from pathlib import Path
|
||||
from typing import Sequence
|
||||
from .runtime_logging import configure
|
||||
|
||||
|
||||
def configure_qt_application(app):
|
||||
"""Apply a predictable light palette across machines and Qt themes."""
|
||||
from PySide6.QtGui import QColor, QPalette
|
||||
|
||||
app.setStyle('Fusion')
|
||||
palette = app.palette()
|
||||
colors = {
|
||||
QPalette.ColorRole.Window: '#f5f6f8',
|
||||
QPalette.ColorRole.WindowText: '#202124',
|
||||
QPalette.ColorRole.Base: '#ffffff',
|
||||
QPalette.ColorRole.AlternateBase: '#eef1f5',
|
||||
QPalette.ColorRole.Text: '#202124',
|
||||
QPalette.ColorRole.Button: '#eef1f5',
|
||||
QPalette.ColorRole.ButtonText: '#202124',
|
||||
QPalette.ColorRole.Highlight: '#2f6fed',
|
||||
QPalette.ColorRole.HighlightedText: '#ffffff',
|
||||
QPalette.ColorRole.ToolTipBase: '#ffffff',
|
||||
QPalette.ColorRole.ToolTipText: '#202124',
|
||||
QPalette.ColorRole.PlaceholderText: '#6b7280',
|
||||
}
|
||||
for role, color in colors.items():
|
||||
palette.setColor(role, QColor(color))
|
||||
for role in (QPalette.ColorRole.WindowText, QPalette.ColorRole.Text, QPalette.ColorRole.ButtonText):
|
||||
palette.setColor(QPalette.ColorGroup.Disabled, role, QColor('#858b94'))
|
||||
app.setPalette(palette)
|
||||
app.setStyleSheet(
|
||||
'QWidget { color: #202124; }'
|
||||
'QTableWidget, QLineEdit, QTextEdit, QSpinBox { '
|
||||
'background: #ffffff; color: #202124; selection-color: #202124; }'
|
||||
'QHeaderView::section { background: #e9edf2; color: #202124; }'
|
||||
'QPushButton, QToolButton { color: #202124; }'
|
||||
'QPushButton:disabled, QToolButton:disabled { color: #858b94; background: #e3e6eb; }'
|
||||
)
|
||||
return app
|
||||
|
||||
def resolve_data_root(cli_value: Path | None) -> Path:
|
||||
if cli_value is not None: return cli_value.expanduser().resolve()
|
||||
if getattr(sys, "frozen", False): return Path(sys.executable).resolve().parent / "data"
|
||||
local = os.environ.get("LOCALAPPDATA")
|
||||
return (Path(local) / "CbbRefreshVerify" if local else Path.home() / "AppData" / "Local" / "CbbRefreshVerify").resolve()
|
||||
|
||||
def main(argv: Sequence[str] | None = None) -> int:
|
||||
parser = argparse.ArgumentParser(prog="CbbRefreshVerify")
|
||||
parser.add_argument('--verify-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--repair-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--owner-probe', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--native-backup-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--management-worker', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--dialog-agent', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--collect-failure-logs', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--batch-lmc', type=Path, help=argparse.SUPPRESS)
|
||||
parser.add_argument('--block', action='append', default=[], help=argparse.SUPPRESS)
|
||||
parser.add_argument('--libspec', default='', help=argparse.SUPPRESS)
|
||||
parser.add_argument('--dms-login-config', default='', help=argparse.SUPPRESS)
|
||||
parser.add_argument('--mentor-bin', default='', help=argparse.SUPPRESS)
|
||||
parser.add_argument("--smoke-test", action="store_true", help=argparse.SUPPRESS); parser.add_argument("--data-root", type=Path, help=argparse.SUPPRESS)
|
||||
args = parser.parse_args(list(argv) if argv is not None else None)
|
||||
if args.owner_probe:
|
||||
from .owner_probe import owner_probe_main
|
||||
return owner_probe_main(args.owner_probe)
|
||||
if args.native_backup_worker:
|
||||
from .native_backup import native_backup_worker_main
|
||||
return native_backup_worker_main(args.native_backup_worker)
|
||||
if args.management_worker:
|
||||
from .native_management import management_worker_main
|
||||
return management_worker_main(args.management_worker)
|
||||
if args.repair_worker:
|
||||
from .native_repair_ui import repair_worker_main
|
||||
return repair_worker_main(args.repair_worker)
|
||||
if args.collect_failure_logs:
|
||||
from .verify_diagnostics import failure_logs_main
|
||||
return failure_logs_main(args.collect_failure_logs)
|
||||
if args.dialog_agent:
|
||||
from .dialog_agent import dialog_agent_main
|
||||
return dialog_agent_main(args.dialog_agent)
|
||||
if args.verify_worker:
|
||||
from .mentor_adapter import worker_main
|
||||
import contextlib
|
||||
with args.verify_worker.with_name('worker.log').open('a', encoding='utf-8') as log:
|
||||
with contextlib.redirect_stdout(log), contextlib.redirect_stderr(log):
|
||||
return worker_main(args.verify_worker)
|
||||
context = configure(resolve_data_root(args.data_root)); logger = context.logger; logger.info("application_start")
|
||||
try:
|
||||
if args.batch_lmc:
|
||||
from .verify_runner import (VerifyRequest, native_lm_verify_enabled,
|
||||
run_batch, write_batch_report, failure_report_path)
|
||||
from .library_reader import read_library_fast
|
||||
from .batch_status import authoritative_status_map
|
||||
from .network_path import LibraryPathLease, select_library_file
|
||||
with LibraryPathLease.acquire(args.batch_lmc) as lease:
|
||||
mentor_path = select_library_file(lease.mentor_path)
|
||||
logger.info(
|
||||
'library_path_lease display=%s mentor=%s drive=%s remote=%s created=%s',
|
||||
lease.display_path, mentor_path, lease.drive or '-',
|
||||
lease.remote_root or '-', lease.created)
|
||||
names = list(args.block)
|
||||
if not names:
|
||||
library = read_library_fast(
|
||||
mentor_path,
|
||||
status_reader=lambda path, names: authoritative_status_map(
|
||||
names, path, context.root/'status-scan.jsonl'),
|
||||
)
|
||||
if library.error: raise RuntimeError(library.error)
|
||||
names = [record.name for record in library.records if record.status != 'READY']
|
||||
if not names: raise RuntimeError('中心库未读取到需要校验的 CBB')
|
||||
requests = [VerifyRequest(mentor_path, name, context.root/'evidence',
|
||||
libspec=args.libspec, dms_login_config=args.dms_login_config,
|
||||
mentor_bin=args.mentor_bin, logging_context=context,
|
||||
mapped_drive=lease.drive,
|
||||
mapped_remote_root=lease.remote_root,
|
||||
native_lm_verify=native_lm_verify_enabled())
|
||||
for name in names]
|
||||
try:
|
||||
results = run_batch(requests)
|
||||
except Exception:
|
||||
lease.retain_for_recovery()
|
||||
raise
|
||||
if any(not result.safe_to_continue for result in results):
|
||||
lease.retain_for_recovery()
|
||||
report = write_batch_report(requests, results, context.root/'reports')
|
||||
logger.info('batch_report path=%s', report)
|
||||
logger.info('failure_report path=%s', failure_report_path(report))
|
||||
code = 0 if all(result.status == 'PASS' for result in results) else 2
|
||||
logger.info('application_clean_shutdown exit_code=%s', code)
|
||||
return code
|
||||
from .ui.main_window import MainWindow, application_icon_path
|
||||
if args.smoke_test:
|
||||
os.environ.setdefault('QT_QPA_PLATFORM', 'offscreen')
|
||||
from PySide6.QtWidgets import QApplication
|
||||
app = QApplication.instance() or QApplication([sys.executable])
|
||||
configure_qt_application(app)
|
||||
window = MainWindow(logging_context=context); window.show()
|
||||
icon_path = application_icon_path()
|
||||
if icon_path.is_file():
|
||||
from PySide6.QtGui import QIcon
|
||||
app.setWindowIcon(QIcon(str(icon_path)))
|
||||
if args.smoke_test:
|
||||
from PySide6.QtCore import QTimer
|
||||
logger.info('gui_smoke_window_created title=%s', window.windowTitle())
|
||||
QTimer.singleShot(250, app.quit)
|
||||
code = int(app.exec()); logger.info("application_clean_shutdown exit_code=%s", code); return code
|
||||
except Exception: logger.exception("application_startup_failure"); return 1
|
||||
finally:
|
||||
for handler in logger.handlers: handler.flush()
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 120 KiB After Width: | Height: | Size: 264 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 MiB After Width: | Height: | Size: 4.8 KiB |
@@ -1 +1,7 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="1024" height="1024" viewBox="0 0 1024 1024"><image width="1024" height="1024" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABAAAAAQACAYAAAB/HSuDAAEAAElEQVR4nOz9C7Ru2XUWBu69//+cc+8tVektS5ZlyQ8JWyW/UnJjjBNKHUNGG+wEEhWDR9NtIECajODQTTokZKgc8mgegxEDPQCnwQPShI4Eo8MjhoQ0VTS2wR1VALtKMio/JFmyLJVslVRV93HO/+/dY805v29+a/3n3Htu1X2cc++atuqe85/97732WnOtNb9vPtY4dOnSpUuXLndAlmUZz3JHj+O43O02dLn7enmW9eBWzaHj3vFm732W+6nL3ZPT6FHXnS5d7q6s7/Lzu3Tp0qVLl7si3QjtchxYKZ/dL7px1km5LudLuj516XI+pC/8Xbp06dLlvjYI7xew1+V0Onmn9OFmiYazNJf6nLkzch7JqNNGAJzHd+vS5V6RM7OZdOnSpUuXe1fOEniBdOOzy3mSWxn+r/dqf7/Rd29FG7rc+wKAr0Afetb1qEuXuyvTXX5+ly5dunTpclekGKNnkZjocvsE463/6v/Oat/fyrYBkCkIOw6Q4bP22i5dTiOqMzq/boZw6tKly+2RPgG7dOnSpcttlfNk7HWgc+9K6/XGZ2d9zO/U/Gn7pPXc9rDtLjcrqjfH6Vjv0S5d7o70CIAuXbp06XLb5JVUFr+TBmI3Ru9NUU+/erTv5LifFQLsOE8+PgNI6+C/y62Q1tt/ko713u7S5e5In3xdunTp0uW2y2mMvpPyRV+OHOe5PO5Z7fVdzr+0IPa4f2/3mJ/07Jd7r+v9/Xrz6la1ocvp5bjIid5/Xbp0OUvSIwC6dOnSpcttl9OAf73uVhrOxwE+9Up1A/3ek+N07U6D/5N+v5Vy3Du1c+m4yIcut186+O/SpctZlR4B0KVLly5d7ohcz0t5EnC6Vc8+Cfx1I/3elXslh/1mj1U7j+/YpUuXLl3unPQIgC5dunTpcibkuPzkV3Kvkzz++P2VPqPL+ZD7ARh3T3+XLl26dDmt9AiALl26dOlyR+R6efg3AmanyXG+xc3tcg/InQzHv11ymtSZLl26dOnS5bTSCYAuXbp06XJXCwC+EvA/nGE5r+3ucnbkbtYy6NKlS5cu96b0FIAuXbp0OUeCAnnDOZFb4XE9b4X6jot00H/P0/h1OXvSwX+XLl26dHkl0o2QLl26dDmHHvOzHsp8syD3NO9y3LF9Z7EfTlu07XY/55U846R0jbPW17dCTjvPTgLetwqQv9zz0e/FMenSpUuXLrdPegRAly5dupwxOU1I/Hkw+k/bxutdd1zEw+04KvBWyWnB252KAng5z7nfPMxthEn7s+racX1yKyJUXi7479KlS5cuXW5WOgHQpUuXLudMzgtQuBVtBLhSUHo9MHZe5OW2HWD0NH2La9p/b1bOcz+fVrRvtL9u9Pl5mIddunTp0qWLSicAunTp0uWcyVn0fL8cudmc+Pas8+EMye1uzyut/dCC1/Z/+reTQtzvNdH3Pu18Oo4QuBVyFnW6S5cuXbrcm9IJgC5dunTpcqblPHlb24J/dyLX/2bkRpETCkTPQ3+/EjlLJNq93tddunTp0uXsSCcAunTp0uUcSRsSfxbltB7V9h1OCrdW0HorgfWdiGY4aZzuVq2AkyIJXulzzrI+Xk9uluy41Xp3VmtZdOnSpUuXe1fO5YbdpUuXLve6tKCgDX0/y4DhRlXVT/r8uFx//Kz3PcvvfjPHAt7s926V3IhAOu8nUJxWblU6yWnm5UnPeiXPv5fGokuXLl263DnpEQBdunTpcgalBf/6+VkLK2/leiDoep+flF99UjG28yp3u/0v19t9rwHNW/0+p02tOGlud+nSpUuXLndCOgHQpUuXLmdUWuB/MxXgbwf4OW249Gk99TfbhrMa/n+SXM+Lfudbk88+6Sg7/Kvealx/lo9efKVy0hGApzkisPyrfXKjyIrTeO1vJkLkXhuLLl26dOly+6UTAF26dOlyRuW4FIC7efzdzQLwlgg47nz1m3n+eQM8Z7Gtp61JoCRAS0QN95gcl3ZynJx0OsL1CISTnvVKr3k513bp0qVLly5FOgHQpUuXLmdcFPSfBYP/pEJ3JwH+4wr6nRbMtwUAz8L734zcjoJ7L0du1IetN1uvP6u55reqH48rrNl+divqb7T6/3Lb2v5+3uZEly5dunS5u9I3jS5dunS5D6UN8z7ttacFke3vxwGsNnT6RkXSzioQPUmu906n/f5wB+W8FVu8Ve28W/p1q8f3rI9Xly5dunQ5G9IJgC5dunS5D+U48H2ja28WsJzGg3oc+DovAPR21wC4UwTAee3nmyGxzrLcjnE+rj/Oez916dKlS5dbI+tbdJ8uXbp06XKOgdNpC/u9nOfo908bJXC9AmunycXucm/LrTrC716V00TonPbzs/4+Xe78WBy3bvfx6NLl/EjfOLt06dLlPpTTgoBXIjcyDK8HOK4H6s+bsflywUuPADi5X+6lSJEid5vIOOt92IFmly5dutw66UUAu3Tp0uU+kutVdb+Zwnynfd71iAU91eCkEw+Oa//1CIW7DaRupeeyLcZ3PwK/46QtUHi323MvyFmbN/dae+8V0TW2j0GXLudXOgHQpUuXLvexnFTR/2a+cxo5Ccyf9tr2b8cZom2F9bNACBwHUk/bJr3uduWJ3+3+eSVyntt+FuU89Wcnfu6+9DHo0uX8SicAunTp0qXLdT3VN3PO+c3IKzlOrf3+WfZK3Yrc6tthbJ/FvroZ6QCk92eXLl26dLl56QRAly5dunS5Lshqw+5PG5Z+Ozzx7Vnqpz2n/TyC3TtRXOs8guizTPacVzlvenAWonvuR+lpN1263BvSF88uXbp0ucfletX+Tzqq7zg5TcV+/f24Z5+mgv9J3znuucfVM2ifc7eLBr7S599sxfvrjc31vvNy29e286Tfu5zcb2elb87DePWCgF26dOnyyuTMbDpdunTp0uX2yGmO+zvuWMCbqVSv378RQL/Zdl/v3xu9y3kGCyeRG7cS+Lf3f6Xtvdeq898vJMB5G6uuY126dOny8qWnAHTp0qXLPS4neeg1nPNmAXILTk+KLLjZkNHTAKGbAfTnFfxDjqtzcKO/a3rEnXrvG0WFdDnbct7GqYeid+nSpcvLl04AdOnSpct9IterRv9KvfX6neMq8Z82muA0wPFG97te2sB5kvYdT1Pb4KQIjNt9nOCN2tXl+nK3Caq7/fwuXbp06XLnpBMAXbp06XIfFTFrPfMKlm8GBJwGVOMZpwXgref6euH+JwHb43LQz2sEQHsM4I3Cnk9K4zhtH7wcfTwuBaT9vZMBNzfWXV6eDvY+7NKlS5fTSd9wunTp0uVlyMsBla8kf/tWAdhXmqd9WlD9csD3cREAtwJInkfwX+S0NQ+Ok5OIEPzttLUgjmvTy3ub2z8OJ5ERp/0Ofr8b+nIWwOt5nSdFzivJ16VLly53Q3oEQJcuXbocI+pxPe5vChiud61+50Z/V2/tcRXVbwVI0Hu+nDzt04Krm40quFEBwpcLfu80KNBxutug7no1H270nZv9292W4+pN6Nw8ru3Hfed+Bf/nWdpImbvbmntXet926XLvSF8ou3Tp0uUWGjcnAeRbHQ79coHKcVEFN/LWX+99Xl7rd+9zu/rnTnkGX65H/Xr3uxmC5ka5/yfd/04b9TdbEPKkaJjj2n+ayIYbffZy23reAdUriQq623Kr516X4/u392OXLveO9AiALl26dLkJuReMoOPC7PXfk+R2pCScRk7jub7ed299i073rFdSeO9WtPss6uorieRQPXg56SWnbcsr0beX25azImdRZ16JaETVWe73syy3ez506dLlzksnALp06dLlFspx6QH6t9Pc4zTh9a/UmNV0g5v5Tvn3dhrSLWhuUyJO0zc38163K/LjVkVH4F6nJWdu5fNV7haJAWnTKm5U1+A0z75boOZuRF7c6oiTV/qs23l/fU77rLPW7126dOlyN6QTAF26dOlyE3Ijr2MLSl5OGOpp6wXcSi/1rf7O9eQ4ENeCj+Py6E/y4h2X+33aNt4qEHijNIqXIzd7n5sBljcLQl8OcDpprE57v5P05DR9fTP3fznfvZ1yM+N+K6NM7rSX/HY/q3uuu3Tp0uV46QRAly5dutyknNdCaWdBWi/5aT2Pbfh3e8+7net7uzzvxz3jJLndgP5WyWnH6rhoEPz7Stp/o7E6T+HOZ6Xg5N2ODDnpb+epX7p06dLlTkknALp06dLlNokC0+uBnrMMOG6FEX2cV/9m7tumAVzPc3u3iYCzILcq1eRWfUflpJSYG+XonwR0X25kwo1IhDsBHlsP9Um1Oe4lIvN2rCddunTp0uXmpBMAXbp06XIb5Ljc5LMacnw7wmgV5N8q0Hia/P/hHpfrjUfr2b4R2HolYf2vhDxo58RJaR4nET83Igtu5j3uphz37ve6Dt+oRsdpCJ6zWEOhS5cuXc6T9AW0S5cuXW5xMbj2s5MKld2Ke98P/XqSZ/RmcsLvB2n7+np9cScB1HHF+o4bQ73+Rve8ne2/GzrU9kOr13e6PWjD7bz/STpxu4sS3s9rRJcuXboU6REAXbp06XKbDcNXasje78WsjoskOA78D/e5qIf9TlV0P42c5OU+CfxfL3LhLLzPnSZJjksV0P/d6nbov7dbjpvDfU536dKly+2VTgB06dLlvpZb5Z3HPW72b9f7/DwD/1uVQ33acPfz3Fd3MgXlZsbkdvXnadpwt+pl3O1CktcD4KdZK25Fus2dBP/tv7c7mucsEWNdunTpcrekEwBdunS5r+VWFN46reF93HWt9/NeArGvFJyfNiS6G/PH93n7WdunN5I7VYLine truncated
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
|
||||
<rect x="3" y="3" width="58" height="58" rx="10" fill="#0f766e"/>
|
||||
<rect x="11" y="12" width="42" height="32" rx="4" fill="#f8fafc"/>
|
||||
<rect x="15" y="16" width="34" height="24" rx="2" fill="#dbeafe"/>
|
||||
<path d="M20 29l6 6 14-14" fill="none" stroke="#16a34a" stroke-width="4" stroke-linecap="round" stroke-linejoin="round"/>
|
||||
<rect x="25" y="47" width="14" height="4" rx="2" fill="#f8fafc"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 1.5 MiB After Width: | Height: | Size: 489 B |
@@ -28,52 +28,32 @@ def _paths(root):
|
||||
return list(_scan(root))
|
||||
|
||||
|
||||
def _idle_check(library, project, pcb, *, confirmation=None, evidence=None, block=''):
|
||||
from .owner_probe import query_owners
|
||||
def _idle_check(library, project, pcb):
|
||||
from .mentor_adapter import _process_details
|
||||
from .icdb_ownership import database_directories, unreleased_addresses
|
||||
from contextlib import ExitStack
|
||||
import win32con, win32file
|
||||
from .operation_queue import note_metadata_progress
|
||||
directories = database_directories(library, project, pcb)
|
||||
scope = (Path(project).parent, *directories)
|
||||
def owners():
|
||||
unknown = []
|
||||
names = ('ExpeditionPCB.exe', 'LibraryManager.exe', 'viewdraw.exe',
|
||||
'iCDBProjectBackup.exe', 'ReuseBlockImporter.exe')
|
||||
for row in query_owners(names):
|
||||
match = _native_scope_match(row['command'], roots=scope, files=(library, project, pcb))
|
||||
for name in ('ExpeditionPCB.exe', 'LibraryManager.exe', 'viewdraw.exe',
|
||||
'iCDBProjectBackup.exe', 'ReuseBlockImporter.exe'):
|
||||
for pid, executable, command, parent in _process_details(name):
|
||||
match = _native_scope_match(command, roots=scope, files=(library, project, pcb))
|
||||
if match is True:
|
||||
raise ValueError(f'TARGET_NATIVE_OWNER_ACTIVE: 目标工程或共享库有原生会话,PID={row["pid"]}')
|
||||
raise ValueError(f'TARGET_NATIVE_OWNER_ACTIVE: 目标工程或共享库有原生会话,PID={pid}')
|
||||
if match is None:
|
||||
unknown.append(row)
|
||||
return unknown
|
||||
def resources():
|
||||
addresses = unreleased_addresses(library, project, pcb)
|
||||
if addresses:
|
||||
raise ValueError(f'TARGET_DATABASE_ADDRESS_UNCONFIRMED: 地址记录需原生确认;未据此判定正在占用:{addresses}')
|
||||
with ExitStack() as stack:
|
||||
paths = [Path(library), Path(pcb).parent/'Layout/LayoutDB.lyt',
|
||||
*(directory/'icdb.dat' for directory in directories)]
|
||||
for path in dict.fromkeys(paths):
|
||||
if path.is_file():
|
||||
handle = win32file.CreateFile(str(path), win32con.GENERIC_READ, 0, None,
|
||||
win32con.OPEN_EXISTING, 0, None)
|
||||
stack.callback(handle.Close)
|
||||
unknown = owners()
|
||||
resources() # Never hold exclusive probe handles while waiting for a user.
|
||||
if not unknown:
|
||||
note_metadata_progress()
|
||||
return
|
||||
if confirmation is None:
|
||||
from .write_admission import WriteAdmissionDeclined
|
||||
raise WriteAdmissionDeclined('skip',
|
||||
'TARGET_NATIVE_OWNER_UNCONFIRMED: 原生程序的工程归属未知,未执行;写入前需要确认。')
|
||||
confirmation.confirm(library, unknown, evidence=evidence, block=block)
|
||||
unknown = owners()
|
||||
if unknown and not confirmation.confirmed(library, unknown):
|
||||
raise ValueError('TARGET_NATIVE_OWNER_UNCONFIRMED: 占用确认后出现新的未知进程,请重新检查。')
|
||||
resources()
|
||||
note_metadata_progress()
|
||||
raise ValueError(f'TARGET_NATIVE_OWNER_UNCONFIRMED: 无法确认原生会话所属工程,PID={pid}')
|
||||
addresses = unreleased_addresses(library, project, pcb)
|
||||
if addresses:
|
||||
raise ValueError(f'TARGET_DATABASE_ADDRESS_UNCONFIRMED: 地址记录需原生确认;未据此判定正在占用:{addresses}')
|
||||
with ExitStack() as stack:
|
||||
paths = [Path(library), Path(pcb).parent/'Layout/LayoutDB.lyt',
|
||||
*(directory/'icdb.dat' for directory in directories)]
|
||||
for path in dict.fromkeys(paths):
|
||||
if path.is_file():
|
||||
handle = win32file.CreateFile(str(path), win32con.GENERIC_READ, 0, None,
|
||||
win32con.OPEN_EXISTING, 0, None)
|
||||
stack.callback(handle.Close)
|
||||
|
||||
|
||||
def _native_scope_match(command, *, roots=(), files=()):
|
||||
@@ -130,15 +110,14 @@ def _source_check(source, name, original):
|
||||
if not pcb.is_relative_to(source.parent.resolve()):
|
||||
raise ValueError('备份 PCB 引用越出工程目录。')
|
||||
if not all(path.is_file() for path in (pcb, pcb.parent/'Layout/LayoutDB.lyt',
|
||||
source.parent/'database/icdb.dat')):
|
||||
raise ValueError('备份不完整:需要原理图数据库、PCB 和布局数据库。')
|
||||
pcb.parent/'pcb.prj', source.parent/'database/icdb.dat')):
|
||||
raise ValueError('备份不完整:需要原理图数据库、PCB、布局数据库和 PCB 工程文件。')
|
||||
project_refs = re.findall(r'^KEY ProjectFile "([^"]+)"', _project_text(pcb), re.M)
|
||||
for value in project_refs:
|
||||
require_relative(value)
|
||||
if len(project_refs) != 1 or (pcb.parent/project_refs[0]).resolve() != source.resolve():
|
||||
raise ValueError('备份 PCB 必须引用所选工程,不能引用其他位置的工程。')
|
||||
from .maintenance_entry import maintenance_project_files
|
||||
for project in maintenance_project_files(source, pcb):
|
||||
for project in (source, pcb.parent/'pcb.prj'):
|
||||
data = _project_text(project)
|
||||
for value in re.findall(r'^KEY iCDBDir "([^"]+)"', data, re.M):
|
||||
require_relative(value)
|
||||
@@ -162,21 +141,17 @@ def _align_library(project, pcb, library):
|
||||
ensure_project_central_library(path, library)
|
||||
|
||||
|
||||
def recover_from_backup(request, source, *, progress=None, verifier=None, idle_check=None, version_prompt=None,stop=None):
|
||||
def recover_from_backup(request, source, *, progress=None, verifier=None, idle_check=None):
|
||||
"""Validate in copies before changing Work; preserve all recovery evidence."""
|
||||
from .operation_queue import check_active, local_commit, note_metadata_progress, QueueCancelled
|
||||
import pythoncom, win32con, win32event
|
||||
from .network_path import absolute_preserving_drive
|
||||
from .verify_runner import run_verify, read_library_flag_if_available
|
||||
verifier = verifier or run_verify
|
||||
idle_check = idle_check or _idle_check
|
||||
source = Path(source).resolve()
|
||||
library = absolute_preserving_drive(request.lmc_file)
|
||||
library_root = library.parent.resolve()
|
||||
root = Path(request.evidence_dir).resolve() / ('backup-restore-' + uuid4().hex[:12])
|
||||
if idle_check is None:
|
||||
from .write_admission import WriteAdmission
|
||||
admission=WriteAdmission(prompt=version_prompt,stop=stop)
|
||||
idle_check=lambda library,project,pcb:_idle_check(library,project,pcb,
|
||||
confirmation=admission,evidence=root,block=request.block_name)
|
||||
# Packaged desktop apps can redirect AppData to a very deep MSIX path.
|
||||
# Keep native EE7.9 files in a genuinely short, user-owned directory.
|
||||
validation_base = Path.home() / '.cbb-restore'
|
||||
@@ -187,16 +162,11 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
return VerifyResult('BLOCKED', stderr='恢复记录目录不能位于备份工程内。')
|
||||
if validation_dir.is_relative_to(library_root) or validation_dir.is_relative_to(source.parent):
|
||||
return VerifyResult('BLOCKED', stderr='本机验证目录不能位于目标库或备份工程内。')
|
||||
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
|
||||
acquired = False
|
||||
library_lock = None
|
||||
release_confirmed = True
|
||||
installed = False
|
||||
def check():
|
||||
check_active()
|
||||
if stop is not None and stop.is_set():
|
||||
raise QueueCancelled('恢复已取消,未提交后续操作。')
|
||||
def completed():
|
||||
check()
|
||||
note_metadata_progress()
|
||||
record = {'operation': 'same_cbb_complete_project_restore', 'source': str(source),
|
||||
'library': str(library), 'block': request.block_name, 'installed': False,
|
||||
'validation_library': str(validation_dir/library.name), 'backup_policy': 'manual'}
|
||||
@@ -221,25 +191,23 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
from .com_runtime import initialize_com, uninitialize_com
|
||||
initialized = initialize_com()
|
||||
try:
|
||||
check()
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (
|
||||
win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired:
|
||||
return VerifyResult('BLOCKED', stderr='已有 CBB 任务运行,请等待结束。', safe_to_continue=False)
|
||||
from .library_lock import LibraryLock
|
||||
library_lock = LibraryLock(library, safe_to_release=lambda: release_confirmed)
|
||||
library_lock.__enter__()
|
||||
if source.is_relative_to(library_root):
|
||||
raise ValueError('请选择目标中心库之外的独立备份工程。')
|
||||
project, pcb = preflight(replace(request, lmc_file=library))
|
||||
completed()
|
||||
source_pcb = _source_check(source, request.block_name, project)
|
||||
completed()
|
||||
root.mkdir(parents=True, exist_ok=False)
|
||||
idle_check(library, project, pcb)
|
||||
completed()
|
||||
idle_check(library, source, source_pcb)
|
||||
completed()
|
||||
root.mkdir(parents=True, exist_ok=False)
|
||||
validation_base.mkdir(parents=True, exist_ok=True)
|
||||
library_size = sum(info.st_size for info in _scan(library_root).values() if stat.S_ISREG(info.st_mode))
|
||||
source_size = sum(info.st_size for info in _scan(source.parent).values() if stat.S_ISREG(info.st_mode))
|
||||
completed()
|
||||
same_drive = root.anchor.casefold() == validation_dir.anchor.casefold()
|
||||
required = (library_size + source_size * 2) if same_drive else 0
|
||||
if (shutil.disk_usage(root).free < required
|
||||
@@ -251,7 +219,6 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
library_scope = ManifestScope.library(request.block_name, library.name)
|
||||
original_manifest = _copy_verified(library_root, validation_dir, scope=library_scope,
|
||||
progress=copy_progress('prepare_source', '正在准备验证库:'))
|
||||
completed()
|
||||
(root/'library-baseline-manifest.json').write_text(json.dumps(original_manifest, indent=2), encoding='utf-8')
|
||||
staged_library = validation_dir/library.name
|
||||
staged_work = staged_library.parent/'ReusableBlocksLP'/request.block_name/'Work'
|
||||
@@ -260,10 +227,8 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
if not resolved_work.is_relative_to(validation_dir.resolve()):
|
||||
raise ValueError('验证副本工程路径越界。')
|
||||
shutil.rmtree(resolved_work)
|
||||
completed()
|
||||
source_manifest = _copy_verified(source.parent, staged_work,
|
||||
progress=copy_progress('prepare_source', '正在准备备份验证工程:'))
|
||||
completed()
|
||||
(root/'source-manifest.json').write_text(json.dumps(source_manifest, indent=2), encoding='utf-8')
|
||||
staged_project = staged_work/source.name
|
||||
staged_pcb = staged_work/source_pcb.relative_to(source.parent)
|
||||
@@ -273,59 +238,43 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
auto_repair=False, libspec='', dms_login_config='', mapped_drive='', mapped_remote_root='',
|
||||
native_lm_verify=False, interactive_input=False)
|
||||
preflight(validation)
|
||||
completed()
|
||||
emit('validate_source', '正在副本中打开备份工程并执行原生校验…')
|
||||
check()
|
||||
release_confirmed = False
|
||||
choice_options = {'version_prompt': version_prompt} if version_prompt is not None else {}
|
||||
if stop is not None:choice_options['stop']=stop
|
||||
source_result = verifier(validation, progress=progress, flag_reader=read_library_flag_if_available, **choice_options)
|
||||
source_result = verifier(validation, progress=progress, flag_reader=read_library_flag_if_available)
|
||||
release_confirmed = source_result.safe_to_continue
|
||||
record['source_validation'] = asdict(source_result)
|
||||
completed()
|
||||
if (source_result.status != 'PASS' or source_result.library_flag != 'GREEN'
|
||||
or not source_result.safe_to_continue):
|
||||
return save(replace(source_result, status='FAIL', stderr=
|
||||
'备份校验未通过,目标未更改。\n' + (source_result.stderr or source_result.library_flag_detail)))
|
||||
idle_check(library, project, pcb)
|
||||
completed()
|
||||
idle_check(staged_library, staged_project, staged_pcb)
|
||||
completed()
|
||||
token = root.name.removeprefix('backup-restore-')
|
||||
work = project.parent.resolve()
|
||||
incoming = work.with_name('Work.restore-' + token)
|
||||
retained = work.with_name('Work.before-restore-' + token)
|
||||
_copy_verified(staged_work, incoming,
|
||||
progress=copy_progress('prepare_source', '正在准备恢复工程:'))
|
||||
completed()
|
||||
_align_library(incoming/source.name, incoming/source_pcb.relative_to(source.parent), library)
|
||||
completed()
|
||||
idle_check(library, source, source_pcb)
|
||||
completed()
|
||||
if _manifest(source.parent) != source_manifest:
|
||||
raise ValueError('备份来源在验证期间发生变化,目标未更改。')
|
||||
completed()
|
||||
if _manifest(library_root, scope=library_scope, exclude=incoming.resolve()) != original_manifest:
|
||||
raise ValueError('目标中心库在验证期间发生变化,停止恢复。')
|
||||
completed()
|
||||
emit('install', '备份已通过验证,正在保留原工程并恢复…')
|
||||
check()
|
||||
with local_commit():
|
||||
work.rename(retained)
|
||||
try:
|
||||
incoming.rename(work)
|
||||
except Exception:
|
||||
retained.rename(work)
|
||||
raise
|
||||
installed = True
|
||||
record['retained_work'] = str(retained)
|
||||
completed()
|
||||
work.rename(retained)
|
||||
try:
|
||||
incoming.rename(work)
|
||||
except Exception:
|
||||
retained.rename(work)
|
||||
raise
|
||||
installed = True
|
||||
record['retained_work'] = str(retained)
|
||||
emit('verify_target', '正在重新打开恢复后的目标工程并校验…')
|
||||
check()
|
||||
release_confirmed = False
|
||||
final = verifier(replace(request, lmc_file=library, evidence_dir=root/'target-verify',
|
||||
auto_repair=False, native_lm_verify=False, interactive_input=False),
|
||||
progress=progress, flag_reader=read_library_flag_if_available, **choice_options)
|
||||
progress=progress, flag_reader=read_library_flag_if_available)
|
||||
release_confirmed = final.safe_to_continue
|
||||
if final.status == 'PASS' and (final.library_flag != 'GREEN' or not final.safe_to_continue):
|
||||
final = replace(final, status='FAIL', stderr='目标工程恢复后的 Ready 状态未确认。')
|
||||
@@ -333,10 +282,6 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
final = replace(final, stderr=(final.stderr + '\n原 Work 已改名保留;应用未创建完整库备份,请查看恢复记录并使用手动备份。').strip())
|
||||
return save(final)
|
||||
except Exception as error:
|
||||
from .write_admission import WriteAdmissionDeclined
|
||||
if isinstance(error, WriteAdmissionDeclined) and not installed:
|
||||
status = 'CANCELLED' if error.decision == 'cancel' else 'SKIPPED'
|
||||
return save(VerifyResult(status, stderr=str(error), safe_to_continue=release_confirmed))
|
||||
return save(VerifyResult('FAIL' if installed else 'BLOCKED', stderr=str(error),
|
||||
safe_to_continue=release_confirmed))
|
||||
finally:
|
||||
@@ -344,4 +289,7 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
|
||||
if library_lock is not None:
|
||||
library_lock.__exit__(None, None, None)
|
||||
finally:
|
||||
if acquired:
|
||||
win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
uninitialize_com(initialized)
|
||||
@@ -107,7 +107,7 @@ def fingerprint_library(lmc: Path) -> LmcFingerprint:
|
||||
# Metadata alone is not a safe checkpoint key: on network shares and on
|
||||
# file systems with coarse timestamp resolution, two different LMC
|
||||
# contents can have the same size and mtime. Include the actual file
|
||||
# digest to invalidate changed LMC bytes; payload edits remain outside this key.
|
||||
# digest so a changed central library can never reuse an old status row.
|
||||
content_sha256 = _sha256_file(path)
|
||||
combined = hashlib.sha256()
|
||||
combined.update(str(path).casefold().encode('utf-8', errors='surrogatepass'))
|
||||
@@ -186,12 +186,7 @@ def _now() -> str:
|
||||
|
||||
|
||||
class BatchStatusSession:
|
||||
"""Supervised serial bridge session; fresh status queries by default.
|
||||
|
||||
Checkpoints record scan evidence. Explicit ``resume=True`` is a low-level
|
||||
opt-in for controlled read-only scans, not a production freshness proof:
|
||||
the lightweight fingerprint does not cover native payload/database edits.
|
||||
"""
|
||||
"""Supervised serial bridge session with checkpoint recovery."""
|
||||
|
||||
def __init__(self, bridge: StatusBridgeClient, *, timeout_seconds: float = 10.0,
|
||||
rotate_every: int = 500) -> None:
|
||||
@@ -201,7 +196,7 @@ class BatchStatusSession:
|
||||
self.restart_count = 0
|
||||
|
||||
def scan(self, names: Iterable[str], lmc_file: Path, checkpoint_path: Path,
|
||||
*, block_type: str = "RULP", resume: bool = False) -> list[BatchStatusRecord]:
|
||||
*, block_type: str = "RULP", resume: bool = True) -> list[BatchStatusRecord]:
|
||||
fingerprint = fingerprint_library(Path(lmc_file))
|
||||
if resume:
|
||||
checkpoint = BatchCheckpoint.load(checkpoint_path)
|
||||
@@ -296,8 +291,6 @@ def authoritative_status_map(names: Iterable[str], lmc_file: Path, checkpoint_pa
|
||||
timeout_seconds: float = 10.0) -> dict[str, str]:
|
||||
"""Return only bridge-backed statuses for an optional UI integration.
|
||||
|
||||
Production always queries fresh statuses, including after native writes;
|
||||
saved READY/PENDING rows are never reused here.
|
||||
A missing bridge is represented as ``UNAVAILABLE``/``UNKNOWN`` by callers;
|
||||
it is never promoted to ``READY``.
|
||||
"""
|
||||
|
||||
@@ -3,4 +3,3 @@
|
||||
DEFAULT_TIMEOUT_SECONDS = 600
|
||||
DIALOG_AGENT_STARTUP_TIMEOUT_SECONDS = 30
|
||||
WORKER_START_GATE_TIMEOUT_SECONDS = DIALOG_AGENT_STARTUP_TIMEOUT_SECONDS + 15
|
||||
NATIVE_WRITE_STOP_WAIT_SECONDS = 120
|
||||
@@ -1,8 +1,6 @@
|
||||
"""Launch automation on a private Windows desktop, never the input desktop."""
|
||||
import subprocess
|
||||
import os
|
||||
import logging
|
||||
from contextlib import contextmanager
|
||||
from pathlib import Path
|
||||
import threading
|
||||
import win32con
|
||||
@@ -14,337 +12,46 @@ import win32service
|
||||
|
||||
_automation_clients = []
|
||||
_automation_clients_lock = threading.Lock()
|
||||
_supervisor_lost = threading.Event()
|
||||
_native_phases = {}
|
||||
WRITER_MUTEX = r'Local\CbbRefreshVerify795NativeWriter'
|
||||
|
||||
|
||||
def assert_native_writer_idle():
|
||||
mutex = win32event.CreateMutex(None, False, WRITER_MUTEX)
|
||||
acquired = False
|
||||
try:
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (
|
||||
win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired:
|
||||
raise RuntimeError('NATIVE_WRITER_ACTIVE: 原生事务尚未返回,未启动新的写入。')
|
||||
finally:
|
||||
if acquired: win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
|
||||
|
||||
class _RegisteredWriter:
|
||||
def __init__(self, handle):
|
||||
import win32api
|
||||
current = win32api.GetCurrentProcess()
|
||||
self.handle = win32api.DuplicateHandle(current, handle, current, 0, False,
|
||||
win32con.DUPLICATE_SAME_ACCESS)
|
||||
self.returncode = None
|
||||
|
||||
def poll(self):
|
||||
if self.returncode is None and win32event.WaitForSingleObject(self.handle, 0) == win32con.WAIT_OBJECT_0:
|
||||
self.returncode = win32process.GetExitCodeProcess(self.handle)
|
||||
self.handle.Close()
|
||||
return self.returncode
|
||||
|
||||
|
||||
def register_native_writer(process):
|
||||
handle = getattr(process, 'handle', None) or getattr(process, '_handle', None)
|
||||
registered = _RegisteredWriter(handle) if handle is not None else process
|
||||
with _automation_clients_lock:
|
||||
_automation_clients.append(registered)
|
||||
return process
|
||||
|
||||
|
||||
class _PendingNativeOperation:
|
||||
"""One asynchronously submitted operation, including its native descendants."""
|
||||
def __init__(self, job, identities):
|
||||
import win32api
|
||||
from .residual_sessions import _handle_identity, _force_ownership
|
||||
from .session_record import IDENTITY_KEYS
|
||||
self.record = job
|
||||
self.job = win32job.CreateJobObject(None, '') # Deliberately no kill-on-close.
|
||||
self.owners = {}
|
||||
self.recorded = set()
|
||||
self.completed = False
|
||||
self.exited = False
|
||||
self.lock = threading.Lock()
|
||||
try:
|
||||
for identity in identities:
|
||||
pid = identity['pid']
|
||||
handle = win32api.OpenProcess(win32con.SYNCHRONIZE | 0x1000 |
|
||||
win32con.PROCESS_SET_QUOTA | win32con.PROCESS_TERMINATE, False, pid)
|
||||
try:
|
||||
actual = dict(pid=pid, **_handle_identity(handle), **_force_ownership(handle, pid))
|
||||
if any(actual[key] != identity.get(key) for key in IDENTITY_KEYS):
|
||||
raise RuntimeError('NATIVE_OPERATION_IDENTITY_CHANGED')
|
||||
win32job.AssignProcessToJobObject(self.job, handle)
|
||||
self.owners[pid] = _RegisteredWriter(handle)
|
||||
self.recorded.add(pid)
|
||||
finally:
|
||||
handle.Close()
|
||||
except Exception:
|
||||
self._close()
|
||||
raise # Admission failure is not permission to post Add without protection.
|
||||
|
||||
def _close(self):
|
||||
for owner in self.owners.values():
|
||||
if owner.returncode is None:
|
||||
owner.handle.Close()
|
||||
self.job.Close()
|
||||
self.exited = True
|
||||
|
||||
def complete(self):
|
||||
with self.lock:
|
||||
self.completed = True # Only an exact native acknowledgement settles the operation.
|
||||
|
||||
def poll(self):
|
||||
with self.lock:
|
||||
return self._poll()
|
||||
|
||||
def _poll(self):
|
||||
if self.exited:
|
||||
return 0
|
||||
pids = set(win32job.QueryInformationJobObject(self.job, win32job.JobObjectBasicProcessIdList))
|
||||
fresh = pids-self.recorded
|
||||
if fresh:
|
||||
from .session_record import update_worker_state
|
||||
from .residual_sessions import _process_handle, _handle_identity, _force_ownership
|
||||
identities = []
|
||||
for pid in fresh:
|
||||
with _process_handle(pid) as handle:
|
||||
if not win32job.IsProcessInJob(handle, self.job):
|
||||
continue # The snapshot PID may have been reused outside this job.
|
||||
identities.append(('native', dict(pid=pid, **_handle_identity(handle),
|
||||
**_force_ownership(handle, pid))))
|
||||
if identities and update_worker_state(self.record, 'UNCONFIRMED', observed_identities=identities):
|
||||
self.recorded.update(identity['pid'] for _, identity in identities)
|
||||
# An acknowledged Add does not retain an otherwise idle LM shell.
|
||||
# Descendants still need observed exit; PID reuse cannot imitate an owner.
|
||||
idle = {pid for pid, owner in self.owners.items() if owner.poll() is None} if self.completed else set()
|
||||
if not pids-idle:
|
||||
self._close()
|
||||
return 0
|
||||
return None
|
||||
|
||||
|
||||
def register_pending_native_operation(job, pids):
|
||||
from .session_record import read_session_record, update_worker_state
|
||||
pids = set(pids)
|
||||
if not pids:
|
||||
raise RuntimeError('NATIVE_OPERATION_OWNER_REQUIRED')
|
||||
# Retain the creation/image/owner identity in the existing bound journal
|
||||
# before asynchronous dispatch, so a restarted UI can validate controls.
|
||||
update_worker_state(job, 'POSTCALL', identities=[('native', pid) for pid in pids], required=True)
|
||||
path = Path(job['session_record_path']).with_name('worker-state.json')
|
||||
record = read_session_record(path, evidence_root=path.parent)
|
||||
identities = [p for p in record.get('processes', ()) if p['pid'] in pids and p.get('role') == 'native']
|
||||
if record['operation_id'] != job['operation_id'] or {p['pid'] for p in identities} != pids:
|
||||
raise RuntimeError('NATIVE_OPERATION_OWNER_UNCONFIRMED')
|
||||
operation = _PendingNativeOperation(job, identities)
|
||||
with _automation_clients_lock:
|
||||
_automation_clients.append(operation)
|
||||
return operation
|
||||
|
||||
|
||||
@contextmanager
|
||||
def worker_native_channel(*, lease_handle=None, inspection_only=False):
|
||||
"""The native worker, not its disposable supervisor, owns write exclusion."""
|
||||
import win32api
|
||||
mutex = win32event.CreateMutex(None, False, WRITER_MUTEX)
|
||||
acquired = False
|
||||
try:
|
||||
if inspection_only is not True:
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (
|
||||
win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired:
|
||||
raise RuntimeError('NATIVE_WRITER_ACTIVE: 原生事务尚未返回。')
|
||||
yield
|
||||
finally:
|
||||
if acquired:
|
||||
# Only registered Save/Close/Repair clients extend the boundary;
|
||||
# an idle PCB shell or a business failure is not a pending write.
|
||||
warned = False
|
||||
while True:
|
||||
with _automation_clients_lock:
|
||||
clients = tuple(_automation_clients)
|
||||
try:
|
||||
released = all(client.poll() is not None for client in clients)
|
||||
except Exception:
|
||||
released = False
|
||||
if not warned:
|
||||
logging.getLogger(__name__).warning('Native writer exit is unconfirmed', exc_info=True)
|
||||
warned = True
|
||||
if released:
|
||||
break
|
||||
threading.Event().wait(.1)
|
||||
win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
if lease_handle is not None:
|
||||
win32api.CloseHandle(int(lease_handle))
|
||||
|
||||
|
||||
def run_native_worker(action, request_path, *, admission_state=None):
|
||||
"""Wait for durable parent admission before acquiring the worker barrier."""
|
||||
import json
|
||||
import time
|
||||
job = json.loads(Path(request_path).read_text(encoding='utf-8'))
|
||||
gate = Path(job['start_gate']) if job.get('start_gate') else None
|
||||
if gate is not None:
|
||||
deadline = time.monotonic()+30
|
||||
while not gate.is_file():
|
||||
if (job.get('cancel_signal') and Path(job['cancel_signal']).exists()
|
||||
or time.monotonic() >= deadline):
|
||||
raise RuntimeError('WORKER_CANCELLED: 未取得启动许可。')
|
||||
threading.Event().wait(.05)
|
||||
lease_handle = None
|
||||
record = None
|
||||
if job.get('session_record_path'):
|
||||
from .session_record import read_session_record, process_identity, IDENTITY_KEYS
|
||||
path = Path(job['session_record_path'])
|
||||
record = read_session_record(path, evidence_root=path.parent)
|
||||
identity = process_identity(os.getpid())
|
||||
if (record['operation_id'] != job['operation_id']
|
||||
or any(record.get(key) != job.get(key) for key in (
|
||||
'operation', 'library', 'block', 'desktop', 'worker_role', 'start_gate_protocol', 'start_gate'))
|
||||
or not any(p.get('role') == 'worker' and all(p.get(k) == identity[k] for k in IDENTITY_KEYS)
|
||||
for p in record.get('processes', ()))):
|
||||
raise RuntimeError('WORKER_ADMISSION_IDENTITY_CHANGED')
|
||||
lease_handle = record.get('worker_lease_handle')
|
||||
if job.get('start_gate_protocol') == 'event-v1':
|
||||
import win32api
|
||||
handle = record.get('worker_start_handle') if record else None
|
||||
if not handle:
|
||||
raise RuntimeError('WORKER_ADMISSION_UNCONFIRMED: 缺少启动事件。')
|
||||
try:
|
||||
deadline = time.monotonic()+30
|
||||
while win32event.WaitForSingleObject(int(handle), 50) != win32con.WAIT_OBJECT_0:
|
||||
if (job.get('cancel_signal') and Path(job['cancel_signal']).exists()
|
||||
or time.monotonic() >= deadline):
|
||||
raise RuntimeError('WORKER_CANCELLED: 启动事件未提交。')
|
||||
finally:
|
||||
win32api.CloseHandle(int(handle))
|
||||
if job.get('worker_role') == 'catalog_readonly':
|
||||
from .native_management import catalog_worker_main
|
||||
if action is not catalog_worker_main or job.get('operation') != 'catalog':
|
||||
raise RuntimeError('WORKER_READONLY_ROLE_MISMATCH')
|
||||
inspection = (action.__module__ == 'cbb_refresh_verify.native_repair_ui'
|
||||
and action.__name__ == 'repair_worker_main' and job.get('inspection_only') is True)
|
||||
with worker_native_channel(lease_handle=lease_handle, inspection_only=inspection):
|
||||
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
|
||||
raise RuntimeError('WORKER_CANCELLED: 已取消原生启动。')
|
||||
if admission_state is not None:
|
||||
admission_state['worker_entered'] = True
|
||||
return action(request_path)
|
||||
|
||||
|
||||
def _phase_pending(phase):
|
||||
if phase not in ('PRECALL', 'POSTCALL', 'RELEASE_CHECK', 'FINISHED', 'NATIVE_CALL', 'CLOSING'):
|
||||
return None
|
||||
from .operation_lifecycle import stop_disposition
|
||||
return stop_disposition(call_started=phase != 'PRECALL',
|
||||
call_returned=phase in ('POSTCALL', 'RELEASE_CHECK', 'FINISHED'),
|
||||
identity_confirmed=True) == 'WAIT_FOR_RETURN'
|
||||
|
||||
|
||||
@contextmanager
|
||||
def worker_phase(operation_id, phase, *, continuation=False):
|
||||
with _automation_clients_lock:
|
||||
existing = continuation and _native_phases.get(operation_id) == phase and _phase_pending(phase) is True
|
||||
if continuation and not existing:
|
||||
raise RuntimeError('WORKER_STATE_UNCONFIRMED: 尚无已派发的原生调用可继续登记')
|
||||
if _supervisor_lost.is_set() and phase in ('NATIVE_CALL', 'CLOSING') and not existing:
|
||||
raise RuntimeError('WORKER_CANCELLED: 监督器已退出,未提交新的原生调用')
|
||||
_native_phases[operation_id] = phase
|
||||
yield
|
||||
|
||||
|
||||
def _record_write_pending(record_path, operation_id=None):
|
||||
if record_path is None:
|
||||
return None
|
||||
from .session_record import read_session_record
|
||||
path = Path(record_path).with_name('worker-state.json')
|
||||
try:
|
||||
state = read_session_record(path, evidence_root=path.parent)
|
||||
if operation_id is not None and state['operation_id'] != operation_id:
|
||||
return None
|
||||
return _phase_pending(state.get('phase'))
|
||||
except (OSError, ValueError):
|
||||
return None
|
||||
|
||||
|
||||
def launch_save_helper(command, *, start_gate=None, identity_path=None, operation_id=None, **kwargs):
|
||||
def launch_save_helper(command, **kwargs):
|
||||
"""Register the save client atomically with respect to supervisor loss."""
|
||||
with _automation_clients_lock:
|
||||
from .operation_queue import check_active
|
||||
check_active()
|
||||
if _supervisor_lost.is_set():
|
||||
raise RuntimeError('VERIFY_CANCELLED: 监督器已退出,未启动新的保存客户端')
|
||||
helper = subprocess.Popen(command, **kwargs)
|
||||
_automation_clients.append(helper)
|
||||
if start_gate is not None:
|
||||
from .session_record import process_identity, read_session_record, write_session_record
|
||||
if identity_path is None or not operation_id:
|
||||
raise ValueError('保存启动门缺少会话记录')
|
||||
state = {'operation_id': operation_id, 'processes': []}
|
||||
identity_path = Path(identity_path)
|
||||
if identity_path.exists():
|
||||
state = read_session_record(identity_path, evidence_root=identity_path.parent)
|
||||
if state['operation_id'] != operation_id:
|
||||
raise ValueError('保存记录不属于当前操作')
|
||||
if helper.poll() is None:
|
||||
state['processes'].append({'role': 'helper', **process_identity(helper.pid)})
|
||||
state['phase'] = 'NATIVE_CALL'
|
||||
write_session_record(identity_path, state)
|
||||
Path(start_gate).touch()
|
||||
return helper
|
||||
|
||||
|
||||
def start_supervisor_watchdog(supervisor_pid, *, cancel_path=None, stop_clients=False,
|
||||
session_record_path=None, operation_id=None, supervisor_identity=None):
|
||||
"""Record stop intent; a watchdog cannot interrupt an in-flight COM call.
|
||||
def start_supervisor_watchdog(supervisor_pid, *, cancel_path=None, stop_clients=False):
|
||||
"""A crashed supervisor must not leave unsupervised automation writing.
|
||||
|
||||
stop_clients is retained for old callers, never permission to kill Save.
|
||||
Stop only this Python worker and its registered automation clients. Native
|
||||
database owners remain alive, including a COM call already in progress.
|
||||
"""
|
||||
import win32api
|
||||
parent = win32api.OpenProcess(win32con.SYNCHRONIZE, False, int(supervisor_pid))
|
||||
if supervisor_identity is not None:
|
||||
from .session_record import process_identity, IDENTITY_KEYS
|
||||
actual = process_identity(int(supervisor_pid))
|
||||
if any(actual[k] != supervisor_identity.get(k) for k in IDENTITY_KEYS):
|
||||
parent.Close()
|
||||
raise RuntimeError('监督器进程身份已变化,未启动原生操作')
|
||||
|
||||
def watch():
|
||||
try:
|
||||
win32event.WaitForSingleObject(parent, win32event.INFINITE)
|
||||
with _automation_clients_lock:
|
||||
_supervisor_lost.set()
|
||||
if cancel_path is not None:
|
||||
try:
|
||||
Path(cancel_path).touch()
|
||||
except OSError:
|
||||
logging.getLogger(__name__).warning('Unable to record orphan cancellation', exc_info=True)
|
||||
if session_record_path is not None:
|
||||
from .session_record import write_session_record
|
||||
try:
|
||||
write_session_record(Path(session_record_path).with_name('supervisor-lost.json'),
|
||||
{'operation_id': operation_id, 'phase': 'SUPERVISOR_LOST'})
|
||||
except (OSError, ValueError):
|
||||
logging.getLogger(__name__).warning('Unable to record supervisor loss', exc_info=True)
|
||||
while True:
|
||||
with _automation_clients_lock:
|
||||
pending = _record_write_pending(session_record_path, operation_id)
|
||||
# The same gate blocks new calls/helpers after loss. A stale
|
||||
# POSTCALL on disk cannot override an active in-memory call.
|
||||
returned = pending is False and _phase_pending(_native_phases.get(operation_id)) is False
|
||||
clients = tuple(_automation_clients)
|
||||
# Polling can publish a job descendant's exact identity. Never
|
||||
# hold the client registry lock while that journal is updated.
|
||||
if returned and all(helper.poll() is not None for helper in clients):
|
||||
os._exit(75) # This Python worker only; native children remain untouched.
|
||||
threading.Event().wait(.2)
|
||||
# Let native calls finish before the worker closes its exact
|
||||
# document. Killing a pending automation client can abandon it.
|
||||
Path(cancel_path).touch()
|
||||
if not stop_clients:
|
||||
return
|
||||
threading.Event().wait(5)
|
||||
with _automation_clients_lock:
|
||||
for helper in _automation_clients:
|
||||
try:
|
||||
if helper.poll() is None:
|
||||
helper.terminate()
|
||||
except OSError:
|
||||
pass
|
||||
finally:
|
||||
parent.Close()
|
||||
if cancel_path is None or stop_clients:
|
||||
os._exit(75)
|
||||
|
||||
thread = threading.Thread(target=watch, name='supervisor-watchdog', daemon=True)
|
||||
thread.start()
|
||||
@@ -373,8 +80,6 @@ class DesktopWorker:
|
||||
self.companions = []
|
||||
self.companion_pids = []
|
||||
self.job_bound = False
|
||||
self.native_worker = any(flag in command for flag in (
|
||||
'--verify-worker', '--management-worker', '--repair-worker', '--native-backup-worker'))
|
||||
# Track the session, but never use kill-on-close: PCB descendants can
|
||||
# still own a database transaction when the Python supervisor exits.
|
||||
try:
|
||||
@@ -384,8 +89,6 @@ class DesktopWorker:
|
||||
startup = win32process.STARTUPINFO()
|
||||
# subprocess.STARTUPINFO does NOT pass lpDesktop to CreateProcess.
|
||||
startup.lpDesktop = startup_desktop_name(name, interactive_input=self.interactive_input)
|
||||
from .operation_queue import check_active
|
||||
check_active()
|
||||
self.handle, thread, self.pid, _ = win32process.CreateProcess(
|
||||
command[0], subprocess.list2cmdline(command), None, None, False,
|
||||
win32con.CREATE_NO_WINDOW, None, None, startup)
|
||||
@@ -425,8 +128,6 @@ class DesktopWorker:
|
||||
raise
|
||||
|
||||
def start_companion(self, command):
|
||||
from .operation_queue import check_active
|
||||
check_active()
|
||||
startup = win32process.STARTUPINFO()
|
||||
startup.lpDesktop = startup_desktop_name(
|
||||
self.name, interactive_input=getattr(self, 'interactive_input', False))
|
||||
@@ -479,25 +180,24 @@ class DesktopWorker:
|
||||
return {'safe_to_continue': False, 'remaining_pids': [], 'error': str(error)}
|
||||
|
||||
def stop_automation_clients(self):
|
||||
# An absent return marker is not permission to interrupt Save/Close.
|
||||
return self._save_clients()
|
||||
from .mentor_adapter import _terminate_pid
|
||||
for pid in self._save_clients():
|
||||
_terminate_pid(pid)
|
||||
|
||||
@property
|
||||
def returncode(self):
|
||||
return self.poll()
|
||||
|
||||
def kill(self):
|
||||
"""Native workers use cooperative stop, including compatibility callers."""
|
||||
if getattr(self, 'native_worker', False) or hasattr(self, 'cancel_path'):
|
||||
if hasattr(self, 'cancel_path'):
|
||||
self.cancel_path.touch()
|
||||
return False
|
||||
"""Stop automation clients only; preserve native PCB/iCDB sessions."""
|
||||
try:
|
||||
win32process.TerminateProcess(self.handle, 1)
|
||||
except Exception:
|
||||
pass
|
||||
# The worker is now stopped and cannot spawn another save helper.
|
||||
try:
|
||||
self.wait(timeout=5)
|
||||
self.stop_automation_clients()
|
||||
except Exception:
|
||||
pass
|
||||
for companion in self.companions:
|
||||
@@ -509,16 +209,6 @@ class DesktopWorker:
|
||||
def bind_cancellation(self, path):
|
||||
self.cancel_path = Path(path)
|
||||
|
||||
def bind_session(self, job):
|
||||
from .session_record import register_worker_session
|
||||
from .library_lock import duplicate_worker_lease
|
||||
lease = (None if job.get('inspection_only') is True else
|
||||
duplicate_worker_lease(job['library'], self.handle))
|
||||
register_worker_session(self, {**job, 'worker_lease_handle': lease})
|
||||
|
||||
def native_write_pending(self):
|
||||
return _record_write_pending(getattr(self, 'session_record_path', None))
|
||||
|
||||
def request_stop(self):
|
||||
if not hasattr(self, 'cancel_path'):
|
||||
# Compatibility for diagnostic workers without the Verify protocol.
|
||||
@@ -538,8 +228,6 @@ class DesktopWorker:
|
||||
try:
|
||||
if self.poll() is None:
|
||||
self.request_stop()
|
||||
if getattr(self, 'native_worker', False) or hasattr(self, 'cancel_path'):
|
||||
return False # The observer keeps this exact process/desktop handle.
|
||||
except Exception:
|
||||
pass
|
||||
for companion in self.companions:
|
||||
|
||||
@@ -9,7 +9,6 @@ import ctypes
|
||||
from ctypes import wintypes
|
||||
import heapq
|
||||
import hashlib
|
||||
import json
|
||||
import ntpath
|
||||
import os
|
||||
from pathlib import Path
|
||||
@@ -139,21 +138,16 @@ def _load_evidence(job, pcb_pid, baseline, *, require_autosave=True):
|
||||
return None
|
||||
|
||||
|
||||
def _target_frame(windows, name, *, require_ready=True):
|
||||
def _target_frame(windows, name):
|
||||
matches = []
|
||||
for window in windows:
|
||||
if not window['class'].casefold().startswith('afx:'):
|
||||
continue
|
||||
if require_ready and (not window.get('enabled', True) or any(
|
||||
child['class'].casefold() == 'msctls_progress32' and child.get('visible', False)
|
||||
for child in window['children'])):
|
||||
if not window['class'].casefold().startswith('afx:') or not window.get('enabled', True):
|
||||
continue
|
||||
if not window['text'].casefold().startswith('expedition pcb') or f'[{name}]'.casefold() not in window['text'].casefold():
|
||||
continue
|
||||
mdi = {child['hwnd'] for child in window['children'] if child['class'].casefold() == 'mdiclient'}
|
||||
documents = [child for child in window['children'] if child.get('parent') in mdi
|
||||
and child['class'].casefold().startswith('afx:')]
|
||||
if len(documents) == 1 and documents[0]['text'].casefold() == name.casefold():
|
||||
if any(child.get('parent') in mdi and child['text'].casefold() == name.casefold()
|
||||
and child['class'].casefold().startswith('afx:') for child in window['children']):
|
||||
matches.append(window)
|
||||
return matches[0] if len(matches) == 1 else None
|
||||
|
||||
@@ -176,23 +170,6 @@ def _windows(pid):
|
||||
# Custom controls may have no cached text; missing evidence fails closed.
|
||||
user.GetWindowTextW(hwnd, buffer, len(buffer))
|
||||
return buffer.value
|
||||
def owner_chain(hwnd):
|
||||
import win32service
|
||||
desktop = win32service.GetUserObjectInformation(win32service.GetThreadDesktop(
|
||||
win32api.GetCurrentThreadId()), 2)
|
||||
chain, seen = [], {hwnd}
|
||||
for _ in range(8):
|
||||
hwnd = int(win32gui.GetWindow(hwnd, 4) or 0)
|
||||
if not hwnd or hwnd in seen: break
|
||||
seen.add(hwnd)
|
||||
thread, owner_pid = win32process.GetWindowThreadProcessId(hwnd)
|
||||
same_desktop = win32service.GetUserObjectInformation(win32service.GetThreadDesktop(thread), 2) == desktop
|
||||
chain.append({'hwnd': hwnd, 'pid': owner_pid, 'class': win32gui.GetClassName(hwnd),
|
||||
'text': text(hwnd), 'visible': bool(win32gui.IsWindowVisible(hwnd)),
|
||||
'enabled': bool(win32gui.IsWindowEnabled(hwnd)), 'same_desktop': same_desktop,
|
||||
'owner': int(win32gui.GetWindow(hwnd, 4) or 0)})
|
||||
if owner_pid != pid or not same_desktop or chain[-1]['visible']: break
|
||||
return chain
|
||||
result = []
|
||||
seen = 0
|
||||
def collect(hwnd, _):
|
||||
@@ -214,10 +191,10 @@ def _windows(pid):
|
||||
raise RuntimeError('DIAGNOSTIC_WINDOW_LIMIT: too many controls')
|
||||
child_cls = win32gui.GetClassName(ch)
|
||||
if (cls == '#32770' or cls.casefold() == 'internet explorer_hidden'
|
||||
or child_cls.casefold() in ('mdiclient', 'msctls_progress32') or child_cls.casefold().startswith('afx:')):
|
||||
or child_cls.casefold() == 'mdiclient' or child_cls.casefold().startswith('afx:')):
|
||||
children.append({'hwnd': ch, 'class': child_cls, 'text': text(ch),
|
||||
'id': win32gui.GetDlgCtrlID(ch), 'parent': win32gui.GetParent(ch),
|
||||
'enabled': bool(win32gui.IsWindowEnabled(ch)), 'visible': bool(win32gui.IsWindowVisible(ch))})
|
||||
'enabled': bool(win32gui.IsWindowEnabled(ch))})
|
||||
return True
|
||||
if cls == '#32770' or cls.casefold().startswith('afx:') or cls.casefold() == 'internet explorer_hidden':
|
||||
win32gui.EnumChildWindows(hwnd, child, None)
|
||||
@@ -228,8 +205,7 @@ def _windows(pid):
|
||||
return True
|
||||
result.append({'hwnd': hwnd, 'pid': pid, 'class': cls, 'text': caption,
|
||||
'enabled': bool(win32gui.IsWindowEnabled(hwnd)), 'children': children,
|
||||
'owner': int(win32gui.GetWindow(hwnd, 4) or 0),
|
||||
'owner_chain': owner_chain(hwnd) if cls == '#32770' else []})
|
||||
'owner': int(win32gui.GetWindow(hwnd, 4) or 0)})
|
||||
return True
|
||||
win32api.SetLastError(0)
|
||||
try:
|
||||
@@ -285,50 +261,6 @@ def _cancel(job):
|
||||
raise RuntimeError('VERIFY_CANCELLED: native opening check cancelled')
|
||||
|
||||
|
||||
def _request_close_handoff(job, pcb_pid, frame, session, emit, deadline):
|
||||
from uuid import uuid4
|
||||
intent = dict(pcb_pid=int(pcb_pid), hwnd=frame['hwnd'], operation_id=job['operation_id'],
|
||||
desktop=job['desktop'], project=job['project'], pcb=job['pcb'], close_id=uuid4().hex)
|
||||
ack = Path(job['root'])/'diagnostic-close-ack.json'
|
||||
emit(stage='diagnostic_close_requested', **intent)
|
||||
def read_ack():
|
||||
try:
|
||||
with ack.open(encoding='utf-8') as stream:
|
||||
return json.loads(stream.read(8192))
|
||||
except (OSError, ValueError):
|
||||
return None
|
||||
while True:
|
||||
_cancel(job)
|
||||
remaining = deadline-time.monotonic()
|
||||
if remaining <= 0 or not session.pcb_alive():
|
||||
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: supervisor handoff not acknowledged')
|
||||
try:
|
||||
acknowledged = _bounded_call(read_ack, min(2, remaining))
|
||||
except TimeoutError as error:
|
||||
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: supervisor acknowledgement read timed out') from error
|
||||
if acknowledged == intent:
|
||||
return intent
|
||||
time.sleep(min(.1, max(0, deadline-time.monotonic())))
|
||||
|
||||
|
||||
def _owned_by_frame(window, frame):
|
||||
if frame is None or window['pid'] != frame['pid']: return False
|
||||
if window.get('owner') == frame['hwnd']: return True
|
||||
chain = window.get('owner_chain', ())
|
||||
expected, seen = window.get('owner'), {window['hwnd']}
|
||||
if not chain or len(chain) > 8: return False
|
||||
for index, owner in enumerate(chain):
|
||||
if (owner['hwnd'] != expected or owner['hwnd'] in seen or owner['pid'] != frame['pid']
|
||||
or owner.get('same_desktop') is not True): return False
|
||||
seen.add(owner['hwnd'])
|
||||
if owner['hwnd'] == frame['hwnd']:
|
||||
return (index == len(chain)-1 and owner['class'] == frame['class'] and owner['text'] == frame['text'])
|
||||
if (owner['class'] != '#32770' or owner['text'] != 'Expedition PCB'
|
||||
or owner['visible'] or owner['enabled']): return False
|
||||
expected = owner['owner']
|
||||
return False
|
||||
|
||||
|
||||
def _pending_prompt(windows, *, closing=False, frame=None, session=None, clicked=None, pcb_name=''):
|
||||
for window in windows:
|
||||
known_titles = {'expedition pcb', 'expedition pcb - reusable block'}
|
||||
@@ -344,21 +276,14 @@ def _pending_prompt(windows, *, closing=False, frame=None, session=None, clicked
|
||||
and child['text'].strip().casefold() == f'Save changes to {pcb_name}?'.casefold()
|
||||
for child in window['children'])
|
||||
and {child.get('id') for child in window['children'] if child['class'].casefold() == 'button'} == {2, 6, 7})
|
||||
forward = (window['class'] == '#32770' and window['text'] == 'Expedition PCB'
|
||||
and any(child['class'].casefold() == 'static' and child.get('id') == 6172
|
||||
and ' '.join(child['text'].split()) == 'New changes are ready for Forward Annotation. Do you want to Forward Annotate now?'
|
||||
for child in window['children'])
|
||||
and {child.get('id') for child in window['children'] if child['class'].casefold() == 'button'} in ({6,7}, {6,7,6171}))
|
||||
if _owned_by_frame(window, frame) and (forward or closing and (standard_save or 'do you want to save the reusable block cell' in text)):
|
||||
if closing and window.get('owner') == frame['hwnd'] and (standard_save or 'do you want to save the reusable block cell' in text):
|
||||
targets = [child for child in window['children'] if child['class'].casefold() == 'button'
|
||||
and child.get('id') == 7 and child['text'].replace('&', '').strip().casefold() in {'no', '否(n)', '否'}
|
||||
and child.get('enabled', True)]
|
||||
if len(targets) == 1:
|
||||
if session is None: return True
|
||||
if window['hwnd'] not in clicked:
|
||||
session.post(targets[0]['hwnd'], 0xF5)
|
||||
clicked.add(window['hwnd'])
|
||||
if not closing: return True
|
||||
continue
|
||||
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: unknown native prompt preserved; '
|
||||
f"pid={window['pid']} hwnd={window['hwnd']} class={window['class']!r} "
|
||||
@@ -366,68 +291,6 @@ def _pending_prompt(windows, *, closing=False, frame=None, session=None, clicked
|
||||
return False
|
||||
|
||||
|
||||
def cancelled_startup_step(job, pcb_pid, state, *, closed_frame, deadline, post, emit,
|
||||
read_windows=None, identity_check=None):
|
||||
"""Finish only the owned no-write diagnostic startup; never establish PASS.
|
||||
|
||||
Cancellation already ended supervisor polling. Cleanup is its sole prompt
|
||||
actor and uses the caller's original deadline and single-close state.
|
||||
"""
|
||||
from types import SimpleNamespace
|
||||
read_windows = read_windows or (lambda: _windows(pcb_pid))
|
||||
windows = read_windows()
|
||||
if any(window['pid'] != pcb_pid for window in windows):
|
||||
raise RuntimeError('STARTUP_PROCESS_UNCONFIRMED')
|
||||
current = _target_frame(windows, Path(job['pcb']).stem, require_ready=False)
|
||||
frame = current
|
||||
if frame is None and closed_frame is not None:
|
||||
frame = state.get('frame')
|
||||
if frame is None:
|
||||
return closed_frame, False
|
||||
old = state.get('frame')
|
||||
if old is not None and any(frame[k] != old[k] for k in ('hwnd', 'pid', 'class', 'text')):
|
||||
raise RuntimeError('STARTUP_DOCUMENT_CHANGED')
|
||||
if closed_frame is not None and frame['hwnd'] != closed_frame:
|
||||
raise RuntimeError('STARTUP_DOCUMENT_CHANGED')
|
||||
if old is None:
|
||||
# Explicit legacy cleanup supplies already checked registration. It is
|
||||
# revalidated immediately before every action, never used as open proof.
|
||||
confirmed = (identity_check is not None or
|
||||
_load_evidence(job, pcb_pid, job['diagnostic_log_baseline'], require_autosave=False) is not None)
|
||||
if not confirmed:
|
||||
return closed_frame, False
|
||||
state['frame'] = frame
|
||||
# Validate every window before allowing a known No. An unknown sibling
|
||||
# must not be hidden by the first recognized modal in enumeration order.
|
||||
try:
|
||||
for window in windows:
|
||||
_pending_prompt([window], closing=closed_frame is not None, frame=frame,
|
||||
pcb_name=Path(job['pcb']).name)
|
||||
except RuntimeError as error:
|
||||
if str(error).startswith('DIAGNOSTIC_CLOSE_UNCONFIRMED: unknown native prompt'):
|
||||
return closed_frame, False
|
||||
raise
|
||||
actions = []
|
||||
def act(hwnd, message):
|
||||
if read_windows() != windows:
|
||||
raise RuntimeError('STARTUP_WINDOW_CHANGED: native snapshot changed before action')
|
||||
if identity_check is not None and not identity_check():
|
||||
raise RuntimeError('STARTUP_IDENTITY_UNCONFIRMED: registered cleanup binding changed')
|
||||
if time.monotonic() >= deadline:
|
||||
raise RuntimeError('STARTUP_CLEANUP_TIMEOUT: original cleanup deadline reached')
|
||||
post(hwnd, message)
|
||||
actions.append((hwnd, message))
|
||||
if message == 0xF5:
|
||||
emit(stage='startup_prompt_no', pcb_pid=pcb_pid, hwnd=hwnd, control_id=7)
|
||||
pending = _pending_prompt(windows, closing=closed_frame is not None, frame=frame,
|
||||
session=SimpleNamespace(post=act), clicked=state['clicked'], pcb_name=Path(job['pcb']).name)
|
||||
if (closed_frame is None and not pending
|
||||
and _target_frame(windows, Path(job['pcb']).stem) is not None):
|
||||
act(frame['hwnd'], 0x10)
|
||||
closed_frame = frame['hwnd']
|
||||
return closed_frame, bool(actions)
|
||||
|
||||
|
||||
def check_target_window(job, pcb_pid, *, emit, error_reader, launcher_process=None) -> dict:
|
||||
"""Prove this launch opened its native document, close it, and prove exit.
|
||||
|
||||
@@ -438,23 +301,8 @@ def check_target_window(job, pcb_pid, *, emit, error_reader, launcher_process=No
|
||||
if not isinstance(baseline, dict) or 'started_ns' not in baseline or 'files' not in baseline:
|
||||
raise RuntimeError('DIAGNOSTIC_BASELINE_REQUIRED: snapshot before native launch')
|
||||
session = _NativeSession(job, int(pcb_pid), launcher_process)
|
||||
def scan(deadline, *, closing=False):
|
||||
while True:
|
||||
if not closing:
|
||||
_cancel(job)
|
||||
try:
|
||||
return _windows(int(pcb_pid))
|
||||
except RuntimeError as error:
|
||||
if str(error) != 'DIAGNOSTIC_WINDOW_LIMIT: window scan exceeded 0.2s':
|
||||
raise
|
||||
# Discard the incomplete snapshot; no control action may use it.
|
||||
emit(stage='diagnostic_window_retry', detail=str(error))
|
||||
if time.monotonic() >= deadline:
|
||||
raise
|
||||
time.sleep(min(.1, max(0, deadline-time.monotonic())))
|
||||
try:
|
||||
deadline = time.monotonic() + max(.01, float(job['timeout']))
|
||||
startup_clicked = set()
|
||||
while True:
|
||||
_cancel(job)
|
||||
error = _read_bounded(error_reader) if error_reader else None
|
||||
@@ -462,44 +310,38 @@ def check_target_window(job, pcb_pid, *, emit, error_reader, launcher_process=No
|
||||
raise RuntimeError(str(error))
|
||||
if not session.pcb_alive():
|
||||
raise RuntimeError('DIAGNOSTIC_OPEN_UNCONFIRMED: target PCB exited before loaded evidence')
|
||||
windows = scan(deadline)
|
||||
windows = _windows(int(pcb_pid))
|
||||
if any(window['pid'] != int(pcb_pid) for window in windows):
|
||||
raise RuntimeError('DIAGNOSTIC_PID_MISMATCH')
|
||||
frame = _target_frame(windows, Path(job['pcb']).stem, require_ready=False)
|
||||
frame = _target_frame(windows, Path(job['pcb']).stem)
|
||||
# Startup splash/control windows are transient. Unknown windows
|
||||
# veto closing only once the target actually has loaded evidence.
|
||||
pending = (_pending_prompt(windows, frame=frame, pcb_name=Path(job['pcb']).name)
|
||||
if frame is not None else True)
|
||||
evidence = (_load_evidence(job, int(pcb_pid), baseline, require_autosave=False)
|
||||
if frame is not None else None)
|
||||
pending = (_pending_prompt(windows, frame=frame, session=session if evidence else None,
|
||||
clicked=startup_clicked, pcb_name=Path(job['pcb']).name) if frame is not None else True)
|
||||
if evidence is not None and not pending and _target_frame(windows, Path(job['pcb']).stem) is not None:
|
||||
if frame is not None and not pending else None)
|
||||
if evidence is not None:
|
||||
emit(stage='diagnostic_native_loaded_candidate', **evidence)
|
||||
break
|
||||
if time.monotonic() >= deadline:
|
||||
raise RuntimeError('DIAGNOSTIC_OPEN_UNCONFIRMED: current target MDI/path/PID logs missing')
|
||||
time.sleep(.1)
|
||||
# Finish any in-flight supervisor poll before WM_CLOSE can create a prompt.
|
||||
close_deadline = time.monotonic() + 30
|
||||
intent = _request_close_handoff(job, pcb_pid, frame, session, emit, close_deadline)
|
||||
# Re-read the exact PID/frame after acknowledgement and before the sole close.
|
||||
# Re-read the exact PID/frame before the sole close request.
|
||||
_cancel(job)
|
||||
error = _read_bounded(error_reader) if error_reader else None
|
||||
if error: raise RuntimeError(str(error))
|
||||
windows = scan(close_deadline)
|
||||
pending = _pending_prompt(windows, frame=frame, pcb_name=Path(job['pcb']).name)
|
||||
windows = _windows(int(pcb_pid))
|
||||
_pending_prompt(windows, frame=frame, pcb_name=Path(job['pcb']).name)
|
||||
current = _target_frame(windows, Path(job['pcb']).stem)
|
||||
if (pending or time.monotonic() >= close_deadline or current is None
|
||||
or any(current[key] != frame[key] for key in ('hwnd', 'pid', 'class', 'text'))):
|
||||
if current is None or current['hwnd'] != frame['hwnd']:
|
||||
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: target frame changed')
|
||||
_cancel(job)
|
||||
session.post(frame['hwnd'], 0x10)
|
||||
emit(stage='diagnostic_wm_close', **intent)
|
||||
emit(stage='diagnostic_wm_close', pcb_pid=int(pcb_pid), hwnd=frame['hwnd'])
|
||||
close_deadline = time.monotonic() + 30
|
||||
clicked = set()
|
||||
last_pending = ''
|
||||
while session.pcb_alive() or session.launcher_alive():
|
||||
# Cancellation stops future work; an accepted normal close must
|
||||
# still finish before its queue slot can be safely released.
|
||||
windows = scan(close_deadline, closing=True) if session.pcb_alive() else []
|
||||
windows = _windows(int(pcb_pid)) if session.pcb_alive() else []
|
||||
previous_clicks = set(clicked)
|
||||
pending_error = None
|
||||
try:
|
||||
|
||||
@@ -236,14 +236,6 @@ class DialogActionExecutor:
|
||||
def perform(self, snapshot: WindowSnapshot, action: dict) -> ActionResult:
|
||||
channels = tuple(action.get("channels", ()))
|
||||
action_name = action.get("action")
|
||||
if action_name == 'user_confirmed_pcb_open':
|
||||
try:
|
||||
from .pcb_open_consent import validate_action_window
|
||||
if channels != ('win32_button_click',):
|
||||
raise ValueError('PCB_OPEN_ACTION_CHANNEL_CHANGED')
|
||||
validate_action_window(snapshot, action)
|
||||
except Exception as error:
|
||||
return ActionResult(error_code='DATABASE_RECOVERY_REQUIRED', detail=str(error))
|
||||
if action_name == 'user_selected_pcb_version':
|
||||
try:
|
||||
from .pcb_restore_prompt import validate_action_window
|
||||
|
||||
@@ -238,16 +238,11 @@ class WindowProbe:
|
||||
process_name = ""
|
||||
controls = tuple(self._win32_control(child) for child in self._children(hwnd))
|
||||
diagnostics = []
|
||||
native_panel = (process_name.casefold() == 'expeditionpcb.exe'
|
||||
and phase in (DialogPhase.SAVE, DialogPhase.CLOSE)
|
||||
and gui.GetClassName(hwnd) == '#32770' and gui.GetWindowText(hwnd) == 'Project Integration')
|
||||
# This native panel's exact control IDs/text are sufficient; its UIA tree can stall Save.
|
||||
if not native_panel:
|
||||
try:
|
||||
uia_records = _bounded_call(lambda: self.uia.controls(hwnd), self.uia_timeout_seconds)
|
||||
controls = self._merge_controls(controls, uia_records)
|
||||
except Exception as error:
|
||||
diagnostics.append(f"UIA_ERROR: {error}")
|
||||
try:
|
||||
uia_records = _bounded_call(lambda: self.uia.controls(hwnd), self.uia_timeout_seconds)
|
||||
controls = self._merge_controls(controls, uia_records)
|
||||
except Exception as error:
|
||||
diagnostics.append(f"UIA_ERROR: {error}")
|
||||
owner = 0
|
||||
try:
|
||||
owner = int(gui.GetWindow(hwnd, 4) or 0) # GW_OWNER
|
||||
|
||||
@@ -116,7 +116,7 @@ def _read_document(path: Path) -> list[dict[str, Any]]:
|
||||
return rules
|
||||
|
||||
|
||||
def load_rules(default_path: Path, override_path: Path | None = None, *, diagnostic_only=False) -> tuple[DialogRule, ...]:
|
||||
def load_rules(default_path: Path, override_path: Path | None = None) -> tuple[DialogRule, ...]:
|
||||
ordered: list[str] = []
|
||||
raw_by_id: dict[str, dict[str, Any]] = {}
|
||||
for raw in _read_document(default_path):
|
||||
@@ -137,12 +137,7 @@ def load_rules(default_path: Path, override_path: Path | None = None, *, diagnos
|
||||
else:
|
||||
ordered.append(rule_id)
|
||||
raw_by_id[rule_id] = dict(override)
|
||||
rules = tuple(_parse_rule(raw_by_id[rule_id]) for rule_id in ordered)
|
||||
if diagnostic_only:
|
||||
# The process-bound diagnostic checker declines this prompt after proving the loaded project.
|
||||
rules = tuple(replace(rule, category='OBSERVE_PROGRESS', action='', channels=(), target=())
|
||||
if rule.rule_id == 'forward-annotation-confirm' else rule for rule in rules)
|
||||
return rules
|
||||
return tuple(_parse_rule(raw_by_id[rule_id]) for rule_id in ordered)
|
||||
|
||||
|
||||
def _semantic_text(snapshot: WindowSnapshot) -> str:
|
||||
@@ -258,22 +253,6 @@ def decide(snapshot: WindowSnapshot, rules: Sequence[DialogRule]) -> RuleDecisio
|
||||
channels=('win32_button_click', 'uia_invoke'),
|
||||
target=(('control_id', 7),), postcondition='window_gone',
|
||||
error_code='MENTOR_DATABASE_LOAD_FAILED', detail=' | '.join(snapshot.texts))
|
||||
if (snapshot.title == 'Project Integration' and snapshot.phase in (DialogPhase.SAVE, DialogPhase.CLOSE)
|
||||
and snapshot.process_name.casefold() == 'expeditionpcb.exe' and snapshot.process_role == 'pcb'
|
||||
and snapshot.window_class == '#32770' and snapshot.owner_hwnd and not snapshot.diagnostics
|
||||
and not re.search(r'\b(?:errors?|failed|inconsistent)\b', combined)):
|
||||
idle = {1033: 'No connectivity changes to be forward annotated',
|
||||
1032: 'No pending schematic CES changes to load into PCB',
|
||||
1035: 'No pending PCB changes to be back annotated',
|
||||
1034: 'No pending CES changes to load into PCB'}
|
||||
complete = all(len(matches := [c for c in snapshot.controls if c.control_id == identifier]) == 1
|
||||
and matches[0].class_name == 'Static' and matches[0].name == text for identifier, text in idle.items())
|
||||
close = [c for c in snapshot.controls if c.control_id == 2]
|
||||
if (complete and len(close) == 1 and close[0].class_name == 'Button'
|
||||
and close[0].name.replace('&', '') == 'Close' and close[0].enabled):
|
||||
return RuleDecision(rule_id='completed-integration-panel', category='SAFE_CONFIRM',
|
||||
action='close_completed_integration', channels=('win32_button_click',),
|
||||
target=(('control_id', 2),), postcondition='window_gone')
|
||||
matches = [rule for rule in rules if _matches(rule, snapshot, include_phase=True)]
|
||||
if matches:
|
||||
best_priority = max(rule.priority for rule in matches)
|
||||
|
||||
@@ -100,10 +100,9 @@ class DialogBackend(Protocol):
|
||||
class AgentDialogBackend:
|
||||
"""Adapt the private-desktop JSONL client to the supervisor backend."""
|
||||
|
||||
def __init__(self, client, *, pids=None, before_action=None) -> None:
|
||||
def __init__(self, client, *, pids=None) -> None:
|
||||
self.client = client
|
||||
self.pids = pids
|
||||
self.before_action = before_action
|
||||
|
||||
def observe(self, phase: DialogPhase):
|
||||
if self.pids is None:
|
||||
@@ -112,7 +111,6 @@ class AgentDialogBackend:
|
||||
return tuple(w for w in self.client.observe(phase, pids=pids) if w.pid in pids)
|
||||
|
||||
def perform(self, snapshot: WindowSnapshot, action: dict, phase: DialogPhase) -> ActionResult:
|
||||
if self.before_action is not None:self.before_action(snapshot,action)
|
||||
return self.client.perform(
|
||||
hwnd=snapshot.hwnd,
|
||||
fingerprint=stable_fingerprint(snapshot),
|
||||
@@ -125,7 +123,7 @@ class Win32DialogBackend:
|
||||
"""Observe and act on dialogs without moving focus, cursor, or desktop."""
|
||||
|
||||
def __init__(self, pids, *, desktop=None, win32gui=None, win32process=None,
|
||||
win32con=None, before_action=None) -> None:
|
||||
win32con=None) -> None:
|
||||
if win32gui is None:
|
||||
import win32gui as win32gui_module
|
||||
win32gui = win32gui_module
|
||||
@@ -140,7 +138,6 @@ class Win32DialogBackend:
|
||||
self.win32gui = win32gui
|
||||
self.win32process = win32process
|
||||
self.win32con = win32con
|
||||
self.before_action = before_action
|
||||
|
||||
def _allowed_pids(self) -> set[int]:
|
||||
values = self.pids() if callable(self.pids) else self.pids
|
||||
@@ -259,7 +256,6 @@ class Win32DialogBackend:
|
||||
return control.control_id
|
||||
|
||||
def perform(self, snapshot: DialogSnapshot, action: str) -> tuple[int, ...]:
|
||||
if self.before_action is not None:self.before_action(snapshot,action)
|
||||
buttons = self._buttons(snapshot)
|
||||
positive = ("yes", "ok", "continue", "retry", "restore", "open", "use", "load",
|
||||
"是", "确定", "继续", "重试", "恢复", "打开", "使用", "加载")
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
"""Close only an idle document whose native identity was already established."""
|
||||
import json
|
||||
from contextlib import ExitStack
|
||||
import os
|
||||
from pathlib import Path
|
||||
import time
|
||||
@@ -54,79 +53,24 @@ def _cancel_target(snapshot):
|
||||
return None
|
||||
|
||||
|
||||
def _tip_target(snapshot):
|
||||
from .dialog_agent import DialogActionExecutor
|
||||
if snapshot.title != 'Tip of the Day' or snapshot.window_class != '#32770':
|
||||
return None
|
||||
target = DialogActionExecutor._target(snapshot, {'control_id': 1})
|
||||
return target if target is not None and target.class_name == 'Button' else None
|
||||
|
||||
|
||||
def cancelled_prewrite_startup(job, pcb_pid=None):
|
||||
"""Positive ordinary pre-document cancellation proof; absence of Save is insufficient."""
|
||||
from .session_record import IDENTITY_KEYS, read_session_record
|
||||
try:
|
||||
if (job.get('diagnostic_only') is not False or job.get('interactive_input')
|
||||
or job.get('native_lm_verify') or job.get('post_repair_consent')
|
||||
or job.get('operation') != 'verify' or not job.get('operation_id')
|
||||
or not job.get('desktop', '').startswith('CbbVerify_')):
|
||||
return None
|
||||
root=Path(job['root'])
|
||||
if not Path(job['cancel_signal']).is_file() or (root/'save.log').exists():return None
|
||||
path=root/'events.jsonl'
|
||||
if path.stat().st_size>1024*1024:return None
|
||||
events=[json.loads(line) for line in path.read_text(encoding='utf-8').splitlines()]
|
||||
if any(str(e.get('stage','')).startswith(('save','integration','validate','failure_close'))
|
||||
or e.get('stage') in ('startup_write_admitted','startup_supervisor_write_possible','identity_verified')
|
||||
for e in events):return None
|
||||
stages=('startup_supervisor_no_write','startup_prewrite_ready','startup_cancelled_prewrite')
|
||||
selected=[]
|
||||
for stage in stages:
|
||||
matches=[(i,e) for i,e in enumerate(events) if e.get('stage')==stage]
|
||||
if len(matches)!=1:return None
|
||||
selected.append(matches[0])
|
||||
if [i for i,_ in selected]!=sorted(i for i,_ in selected):return None
|
||||
binding={k:job[k] for k in ('operation_id','project','pcb','desktop')}
|
||||
if any(any(e.get(k)!=v for k,v in binding.items()) for _,e in selected):return None
|
||||
ready,cancelled=selected[1][1],selected[2][1]
|
||||
pid=cancelled.get('pcb_pid')
|
||||
if (not pid or pcb_pid is not None and pid!=pcb_pid
|
||||
or cancelled.get('identity_verified') is not False or cancelled.get('write_admitted') is not False):return None
|
||||
if not any(e.get('stage')=='pcb_worker_started' and e.get('pcb_pid')==pid
|
||||
for e in events[selected[1][0]+1:selected[2][0]]):return None
|
||||
session=read_session_record(Path(job['session_record_path']),evidence_root=root)
|
||||
workers=[p for p in session.get('processes',()) if p.get('role')=='worker']
|
||||
if (session.get('operation_id')!=job['operation_id'] or session.get('desktop')!=job['desktop']
|
||||
or session.get('library')!=job['library'] or len(workers)!=1
|
||||
or not set(IDENTITY_KEYS)<=ready.get('worker_identity',{}).keys()
|
||||
or any(ready.get('worker_identity',{}).get(k)!=workers[0].get(k) for k in IDENTITY_KEYS)):return None
|
||||
baseline=ready.get('baseline')
|
||||
if not isinstance(baseline,dict) or not {'started_ns','files'}<=baseline.keys():return None
|
||||
return baseline
|
||||
except (OSError,ValueError,KeyError,TypeError):
|
||||
return None
|
||||
|
||||
|
||||
def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event: None,
|
||||
timeout_seconds=None, launcher_process=None):
|
||||
timeout_seconds=20, launcher_process=None):
|
||||
"""Normally close our empty PCB after a diagnosed database startup failure.
|
||||
|
||||
No COM attach: the global ROT can name another session. Only the exact
|
||||
read/write question is declined; no ownership is taken or version restored.
|
||||
Unknown windows and documents are retained. WM_CLOSE is cooperative.
|
||||
"""
|
||||
import win32api, win32con, win32gui, win32process, win32event
|
||||
import win32api, win32con, win32gui, win32process
|
||||
from .mentor_adapter import _process_details
|
||||
from .native_repair_ui import _current_desktop_name
|
||||
from .icdb_ownership import unreleased_addresses
|
||||
from . import residual_sessions
|
||||
root = Path(job['root'])
|
||||
result = {'status': 'RETAINED', 'pcb_pid': pcb_pid}
|
||||
result['release'] = {'pcb_exited': False, 'launcher_exited': launcher_process is None,
|
||||
'safe_to_continue': False}
|
||||
if launcher_process is not None:
|
||||
result['launcher_pid'] = launcher_process.pid
|
||||
handles = ExitStack()
|
||||
try:
|
||||
desktop = job.get('desktop', '')
|
||||
if (job.get('interactive_input') or not desktop.startswith('CbbVerify_')
|
||||
@@ -135,45 +79,14 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
|
||||
if not pcb_pid or pcb_pid in baseline_pids:
|
||||
raise ValueError('STARTUP_PROCESS_UNCONFIRMED')
|
||||
expected = os.path.normcase(os.path.abspath(job['pcb']))
|
||||
cancelled_diagnostic = (job.get('diagnostic_only') is True
|
||||
and bool(job.get('cancel_signal')) and Path(job['cancel_signal']).exists()
|
||||
and isinstance(job.get('diagnostic_log_baseline'), dict)
|
||||
and {'started_ns', 'files'} <= job['diagnostic_log_baseline'].keys()
|
||||
and not (root/'save.log').exists())
|
||||
ordinary_baseline=cancelled_prewrite_startup(job,pcb_pid)
|
||||
cancelled_prewrite=ordinary_baseline is not None
|
||||
# Diagnostic close already owns a 30-second cleanup budget. Start it
|
||||
# once here; the empty-to-loaded transition never resets that deadline.
|
||||
if timeout_seconds is None:
|
||||
timeout_seconds = 30 if cancelled_diagnostic or cancelled_prewrite else 20
|
||||
deadline = time.monotonic() + max(0, timeout_seconds)
|
||||
sent = False
|
||||
declined_hwnd = None
|
||||
declined_kind = None
|
||||
cancelled_open = False
|
||||
dismissed_tips = set()
|
||||
close_handle = None
|
||||
close_identity = None
|
||||
close_frame = None
|
||||
diagnostic_state = {'clicked': set()}
|
||||
def cleanup_post(hwnd, message):
|
||||
if (time.monotonic() >= deadline or _current_desktop_name() != desktop
|
||||
or cancelled_prewrite and cancelled_prewrite_startup(job,pcb_pid)!=ordinary_baseline
|
||||
or win32event.WaitForSingleObject(close_handle, 0) != win32con.WAIT_TIMEOUT
|
||||
or residual_sessions._handle_identity(close_handle) != close_identity
|
||||
or win32process.GetWindowThreadProcessId(hwnd)[1] != pcb_pid):
|
||||
raise ValueError('STARTUP_ACTION_UNCONFIRMED')
|
||||
win32gui.PostMessage(hwnd, message, 0, 0)
|
||||
while True:
|
||||
records = [r for r in _process_details('ExpeditionPCB.exe') if r[0] == pcb_pid]
|
||||
if not records:
|
||||
if (close_handle is not None
|
||||
and win32event.WaitForSingleObject(close_handle, 0) != win32con.WAIT_OBJECT_0):
|
||||
result['detail'] = 'STARTUP_EXIT_UNCONFIRMED: 原进程句柄尚未确认退出'
|
||||
if time.monotonic() >= deadline:
|
||||
break
|
||||
time.sleep(.2)
|
||||
continue
|
||||
if declined_hwnd is not None:
|
||||
cancelled_open = True
|
||||
result['cancelled_prompt'] = declined_kind
|
||||
@@ -198,34 +111,6 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
|
||||
or '-reusablecircuit' not in [a.casefold() for a in args]
|
||||
or expected not in [os.path.normcase(os.path.abspath(a)) for a in args[1:]]):
|
||||
raise ValueError('STARTUP_PROCESS_UNCONFIRMED')
|
||||
if cancelled_diagnostic or cancelled_prewrite:
|
||||
if time.monotonic() >= deadline:
|
||||
result['detail']='STARTUP_CLEANUP_TIMEOUT: original cleanup deadline reached'
|
||||
break
|
||||
if cancelled_prewrite and cancelled_prewrite_startup(job,pcb_pid)!=ordinary_baseline:
|
||||
raise ValueError('STARTUP_IDENTITY_UNCONFIRMED: pre-write phase proof changed')
|
||||
if (cancelled_diagnostic or cancelled_prewrite) and time.monotonic() < deadline:
|
||||
if close_handle is None:
|
||||
close_handle = handles.enter_context(residual_sessions._process_handle(pcb_pid))
|
||||
close_identity = residual_sessions._handle_identity(close_handle)
|
||||
if Path(close_identity['image']).name.casefold() != 'expeditionpcb.exe':
|
||||
raise ValueError('STARTUP_PROCESS_UNCONFIRMED')
|
||||
from .diagnostic_open import cancelled_startup_step
|
||||
def ordinary_identity():
|
||||
from .diagnostic_open import _load_evidence
|
||||
return (cancelled_prewrite_startup(job,pcb_pid)==ordinary_baseline
|
||||
and _load_evidence(job,pcb_pid,ordinary_baseline,require_autosave=False) is not None)
|
||||
closed, acted = cancelled_startup_step(job, pcb_pid, diagnostic_state,
|
||||
closed_frame=close_frame, deadline=deadline, post=cleanup_post, emit=emit,
|
||||
identity_check=ordinary_identity if cancelled_prewrite else None)
|
||||
if closed is not None and not sent:
|
||||
sent, close_frame = True, closed
|
||||
emit(stage='startup_close_requested', pcb_pid=pcb_pid, hwnd=closed,
|
||||
document_identity='native_path_pid_logs',
|
||||
cleanup='cancelled_prewrite' if cancelled_prewrite else 'cancelled_diagnostic')
|
||||
if acted:
|
||||
continue
|
||||
if not sent:
|
||||
windows = []
|
||||
def observe(hwnd, _):
|
||||
if (win32process.GetWindowThreadProcessId(hwnd)[1] == pcb_pid
|
||||
@@ -236,27 +121,6 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
|
||||
if declined_hwnd is not None and declined_hwnd not in windows:
|
||||
cancelled_open = True
|
||||
result['cancelled_prompt'] = declined_kind
|
||||
dismissed = False
|
||||
for hwnd in windows:
|
||||
if hwnd in dismissed_tips or win32gui.GetClassName(hwnd) != '#32770':
|
||||
continue
|
||||
snapshot = _startup_snapshot(hwnd, pcb_pid)
|
||||
target = _tip_target(snapshot)
|
||||
if target is None:
|
||||
continue
|
||||
current = _startup_snapshot(hwnd, pcb_pid)
|
||||
if current != snapshot or _tip_target(current) != target:
|
||||
raise ValueError('STARTUP_TIP_CHANGED')
|
||||
if cancelled_diagnostic or cancelled_prewrite:
|
||||
cleanup_post(target.handle,win32con.BM_CLICK)
|
||||
else:
|
||||
win32gui.PostMessage(target.handle, win32con.BM_CLICK, 0, 0)
|
||||
dismissed_tips.add(hwnd)
|
||||
dismissed = True
|
||||
emit(stage='startup_tip_dismissed', pcb_pid=pcb_pid, hwnd=hwnd)
|
||||
break
|
||||
if dismissed:
|
||||
continue # Prove the Tip disappeared; it does not prove a cancelled open.
|
||||
if declined_hwnd is None:
|
||||
for hwnd in windows:
|
||||
if win32gui.GetClassName(hwnd) != '#32770':
|
||||
@@ -270,10 +134,7 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
|
||||
if _cancel_target(current) != target or current != snapshot:
|
||||
raise ValueError('STARTUP_CANCEL_PROMPT_CHANGED')
|
||||
declined_kind, cancel = target
|
||||
if cancelled_diagnostic or cancelled_prewrite:
|
||||
cleanup_post(cancel.handle,win32con.BM_CLICK)
|
||||
else:
|
||||
win32gui.PostMessage(cancel.handle, win32con.BM_CLICK, 0, 0)
|
||||
win32gui.PostMessage(cancel.handle, win32con.BM_CLICK, 0, 0)
|
||||
declined_hwnd = hwnd
|
||||
emit(stage='startup_open_declined', pcb_pid=pcb_pid, hwnd=hwnd,
|
||||
control_id=cancel.control_id, prompt=declined_kind)
|
||||
@@ -312,38 +173,15 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
|
||||
win32gui.EnumChildWindows(main[0], child, None)
|
||||
addresses = unreleased_addresses(job['lmc_file'], job['project'], job['pcb'])
|
||||
if len(main) == 1 and not unknown and not documents and (cancelled_open or not addresses):
|
||||
if close_handle is None:
|
||||
close_handle = handles.enter_context(residual_sessions._process_handle(pcb_pid))
|
||||
close_identity = residual_sessions._handle_identity(close_handle)
|
||||
if Path(close_identity['image']).name.casefold() != 'expeditionpcb.exe':
|
||||
raise ValueError('STARTUP_PROCESS_UNCONFIRMED')
|
||||
if cancelled_diagnostic or cancelled_prewrite:
|
||||
cleanup_post(main[0],win32con.WM_CLOSE)
|
||||
else:
|
||||
win32gui.PostMessage(main[0], win32con.WM_CLOSE, 0, 0)
|
||||
close_frame = main[0]
|
||||
win32gui.PostMessage(main[0], win32con.WM_CLOSE, 0, 0)
|
||||
sent = True
|
||||
emit(stage='startup_close_requested', pcb_pid=pcb_pid, hwnd=main[0])
|
||||
# Observe exit even when the caller requested no extra wait.
|
||||
continue
|
||||
result['detail'] = 'STARTUP_IDLE_UNCONFIRMED: 等待空闲窗口和数据库释放'
|
||||
# WMI fields can disappear during teardown. The held identity binds
|
||||
# any late Tip action to the original process, never a reused PID.
|
||||
if sent and time.monotonic() < deadline:
|
||||
if _current_desktop_name() != desktop:
|
||||
raise ValueError('STARTUP_DESKTOP_UNCONFIRMED')
|
||||
snapshot = residual_sessions._process_windows({pcb_pid})
|
||||
windows = snapshot.get(pcb_pid, [])
|
||||
if all(w.get('desktop') == desktop for w in windows):
|
||||
dismissed = residual_sessions._dismiss_startup_tip(
|
||||
dict(pid=pcb_pid, name='ExpeditionPCB.exe', scope_confirmed=True, startup_frame=close_frame,
|
||||
**close_identity), close_handle, windows,
|
||||
incomplete=residual_sessions._window_error(snapshot, pcb_pid),
|
||||
dismissed=dismissed_tips, deadline=deadline)
|
||||
if dismissed is not None:
|
||||
dismissed_tips.add(dismissed)
|
||||
emit(stage='startup_tip_dismissed', pcb_pid=pcb_pid, hwnd=dismissed)
|
||||
continue
|
||||
# After the single owned WM_CLOSE, WMI may lose the executable/
|
||||
# command fields before removing the PID. Only observe exit here;
|
||||
# never issue another close or treat missing fields as release.
|
||||
if time.monotonic() >= deadline:
|
||||
if sent:
|
||||
result['detail'] = 'STARTUP_EXIT_UNCONFIRMED: 已请求正常关闭,但 PCB 尚未退出'
|
||||
@@ -351,8 +189,6 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
|
||||
time.sleep(.2)
|
||||
except Exception as error:
|
||||
result['detail'] = str(error)
|
||||
finally:
|
||||
handles.close()
|
||||
(root/'startup-close.json').write_text(json.dumps(result, ensure_ascii=False, indent=2), encoding='utf-8')
|
||||
emit(stage='startup_close_result', **result)
|
||||
return result
|
||||
|
||||
@@ -1,151 +0,0 @@
|
||||
"""Bound read-only filesystem probes; keep proof handles alive through commit."""
|
||||
from contextlib import contextmanager, ExitStack
|
||||
import hashlib
|
||||
import json
|
||||
from pathlib import Path
|
||||
import re
|
||||
import stat
|
||||
import subprocess
|
||||
import sys
|
||||
import tempfile
|
||||
import time
|
||||
from uuid import uuid4
|
||||
|
||||
|
||||
@contextmanager
|
||||
def hold_release_files(library, roots=None, *, timeout_seconds=10, stop=None):
|
||||
"""Only this pure probe may be terminated. stdin EOF releases its handles."""
|
||||
with tempfile.TemporaryDirectory(prefix='cbb-file-probe-') as folder:
|
||||
job = Path(folder)/'request.json'
|
||||
token = uuid4().hex
|
||||
job.write_text(json.dumps({'token': token, 'library': str(library),
|
||||
'roots': [str(p) for p in roots] if roots is not None else None}), 'utf-8')
|
||||
command = ([sys.executable] if getattr(sys, 'frozen', False) else
|
||||
[sys.executable, '-m', 'cbb_refresh_verify']) + ['--file-probe', str(job)]
|
||||
process = subprocess.Popen(command, stdin=subprocess.PIPE, stdout=subprocess.DEVNULL,
|
||||
stderr=subprocess.DEVNULL, creationflags=getattr(subprocess, 'CREATE_NO_WINDOW', 0))
|
||||
try:
|
||||
deadline = time.monotonic()+max(.1, min(10, timeout_seconds))
|
||||
result_path = job.with_name('result.json')
|
||||
while not result_path.exists():
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('FILE_PROBE_CANCELLED')
|
||||
if time.monotonic() >= deadline:
|
||||
raise TimeoutError('FILE_PROBE_TIMEOUT: 文件占用检查超时,未证明释放')
|
||||
if process.poll() is not None:
|
||||
raise OSError('FILE_PROBE_UNCONFIRMED: 文件探测未返回证据')
|
||||
time.sleep(.02)
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('FILE_PROBE_CANCELLED')
|
||||
record = json.loads(result_path.read_text('utf-8'))
|
||||
if record.get('token') != token or record.get('status') != 'HELD' or process.poll() is not None:
|
||||
error = OSError('FILE_PROBE_UNCONFIRMED: '+str(record.get('error', '探测身份或句柄失效')))
|
||||
error.winerror = record.get('winerror')
|
||||
raise error
|
||||
# Duplicate the already-open handles before acknowledging the probe.
|
||||
# Its exit can never create a gap in the parent's commit protection.
|
||||
import win32api, win32con
|
||||
with ExitStack() as protection:
|
||||
child = win32api.OpenProcess(win32con.PROCESS_DUP_HANDLE, False, process.pid)
|
||||
protection.callback(child.Close)
|
||||
if len(record['handles']) != len(record['exclusive_files'])+len(record['binding_files']):
|
||||
raise OSError('FILE_PROBE_UNCONFIRMED: 证明句柄数量不符')
|
||||
for handle in record['handles']:
|
||||
owned = win32api.DuplicateHandle(child, handle, win32api.GetCurrentProcess(),
|
||||
0, False, win32con.DUPLICATE_SAME_ACCESS)
|
||||
protection.callback(owned.Close)
|
||||
yield {k: v for k, v in record.items() if k != 'handles'}
|
||||
finally:
|
||||
process.stdin.close()
|
||||
try:
|
||||
process.wait(.5)
|
||||
except subprocess.TimeoutExpired:
|
||||
process.terminate() # This executable only scans and opens read handles.
|
||||
process.wait(3)
|
||||
|
||||
|
||||
def _snapshot(library, roots):
|
||||
from .scoped_manifest import scan_tree
|
||||
entries = {library: library.lstat()}
|
||||
for root in roots:
|
||||
if root.exists():
|
||||
entries.update(scan_tree(root))
|
||||
native = sorted(path for path, info in entries.items() if stat.S_ISREG(info.st_mode)
|
||||
and (path == library or path.name.casefold() in ('icdb.dat', 'layoutdb.lyt')))
|
||||
if library not in native:
|
||||
raise ValueError('目标库身份缺失')
|
||||
addresses = sorted(path for path in entries if path.name.casefold() == 'saddress.adr')
|
||||
targets, signatures = [], {}
|
||||
for address in addresses:
|
||||
data = address.read_bytes()
|
||||
signatures[str(address)] = hashlib.sha256(data).hexdigest()
|
||||
database = address.parent.parent
|
||||
matches = []
|
||||
for project in database.parent.glob('*.prj'):
|
||||
if project not in entries or project.stat().st_size > 1024*1024:
|
||||
continue
|
||||
from .backup_recovery import _project_text
|
||||
text = _project_text(project)
|
||||
references = re.findall(r'^KEY iCDBDir "([^"\r\n]+)"', text, re.M)
|
||||
if len(references) == 1 and (project.parent/references[0]).resolve() == database:
|
||||
matches.append(project)
|
||||
if len(matches) != 1 or database/'icdb.dat' not in native:
|
||||
raise ValueError(f'地址未绑定唯一工程数据库,需人工核对:{address}')
|
||||
targets.append({'project': str(matches[0]), 'database': str(database)})
|
||||
signatures[str(matches[0])] = hashlib.sha256(matches[0].read_bytes()).hexdigest()
|
||||
return {'exclusive_files': [str(p) for p in native], 'addresses': [str(p) for p in addresses],
|
||||
'inspection_targets': targets, 'signatures': signatures, 'binding_files': sorted(signatures),
|
||||
'resource_scope': {'library': str(library), 'roots': [str(p) for p in roots],
|
||||
'projects': sorted(str(p) for p in entries if p.suffix.casefold() == '.prj'),
|
||||
'shared_dependencies': sorted(str(p.parent) for p in native
|
||||
if p.is_relative_to(library.parent/'SymbolLibs') and p.name.casefold() == 'icdb.dat'),
|
||||
'databases': sorted({str(p.parent) for p in native if p.name.casefold() == 'icdb.dat'})}}
|
||||
|
||||
|
||||
def file_probe_main(job):
|
||||
"""No native launch, writes, repair, address deletion or process termination."""
|
||||
import win32con, win32file
|
||||
job = Path(job)
|
||||
request = json.loads(job.read_text('utf-8'))
|
||||
result = {'token': request['token'], 'status': 'UNCONFIRMED'}
|
||||
try:
|
||||
def checked_path(value):
|
||||
path = Path(value).absolute()
|
||||
for part in (path, *path.parents):
|
||||
try:
|
||||
info = part.lstat()
|
||||
except FileNotFoundError:
|
||||
continue
|
||||
if info.st_file_attributes & stat.FILE_ATTRIBUTE_REPARSE_POINT:
|
||||
raise ValueError(f'资源范围含重解析点:{part}')
|
||||
return path.resolve()
|
||||
library = checked_path(request['library'])
|
||||
roots = [checked_path(p) for p in request['roots']] if request['roots'] is not None else [library.parent]
|
||||
if library.suffix.casefold() != '.lmc' or any(not p.is_relative_to(library.parent) for p in roots):
|
||||
raise ValueError('文件探测范围不属于所选库')
|
||||
snapshot = _snapshot(library, roots)
|
||||
with ExitStack() as stack:
|
||||
handles = []
|
||||
for path in snapshot['exclusive_files']:
|
||||
handle = win32file.CreateFile(path, win32con.GENERIC_READ, 0, None,
|
||||
win32con.OPEN_EXISTING, win32con.FILE_ATTRIBUTE_NORMAL, None)
|
||||
stack.callback(handle.Close)
|
||||
handles.append(int(handle))
|
||||
for path in snapshot['binding_files']:
|
||||
handle = win32file.CreateFile(path, win32con.GENERIC_READ, win32con.FILE_SHARE_READ,
|
||||
None, win32con.OPEN_EXISTING, win32con.FILE_ATTRIBUTE_NORMAL, None)
|
||||
stack.callback(handle.Close)
|
||||
handles.append(int(handle))
|
||||
if _snapshot(library, roots) != snapshot:
|
||||
raise ValueError('占用检查期间资源集合变化')
|
||||
pending = job.with_name('result.pending')
|
||||
pending.write_text(json.dumps({**result, **snapshot, 'status': 'HELD', 'handles': handles}), 'utf-8')
|
||||
pending.replace(job.with_name('result.json'))
|
||||
sys.stdin.buffer.read(1) # Parent keeps stdin open until its commit finishes.
|
||||
return 0
|
||||
except Exception as error:
|
||||
pending = job.with_name('result.pending')
|
||||
pending.write_text(json.dumps({**result, 'error': str(error),
|
||||
'winerror': getattr(error, 'winerror', None)}), 'utf-8')
|
||||
pending.replace(job.with_name('result.json'))
|
||||
return 1
|
||||
@@ -2,19 +2,6 @@
|
||||
from pathlib import Path
|
||||
|
||||
|
||||
def session_resource_scope(job):
|
||||
"""Persist declared targets; only fresh proof promotes them to observed scope."""
|
||||
library = Path(job['library'])
|
||||
project, pcb = job.get('project'), job.get('pcb')
|
||||
projects = [str(Path(project))] if project else []
|
||||
databases = [str(Path(p).parent/'database') for p in (project, pcb) if p]
|
||||
shared = library.parent/'SymbolLibs/__ReusableBlocksSymb'
|
||||
return {'scope_state': 'DECLARED' if project else 'RECHECK_REQUIRED',
|
||||
'library': str(library), 'operation_id': job.get('operation_id'),
|
||||
'block_name': job.get('block'), 'projects': projects,
|
||||
'databases': list(dict.fromkeys(databases)), 'shared_dependencies': [str(shared)]}
|
||||
|
||||
|
||||
def database_directories(lmc_file, project, pcb):
|
||||
return tuple(dict.fromkeys((
|
||||
Path(project).parent/'database',
|
||||
@@ -27,20 +14,3 @@ def unreleased_addresses(lmc_file, project, pcb):
|
||||
return [str(path/'cdbsvr/sAddress.adr')
|
||||
for path in database_directories(lmc_file, project, pcb)
|
||||
if (path/'cdbsvr/sAddress.adr').exists()]
|
||||
|
||||
|
||||
def inspect_release_addresses(snapshot, *, stop=None):
|
||||
"""An address is a reason for native inspection, never an occupancy verdict."""
|
||||
import tempfile
|
||||
from .native_repair import RepairTarget, run_native_repair
|
||||
from .native_occupancy import confirmed_inspection
|
||||
from .library_lock import LibraryBusy
|
||||
results = []
|
||||
for item in snapshot['inspection_targets']:
|
||||
target = RepairTarget(Path(item['project']), Path(item['database']))
|
||||
root = Path(tempfile.mkdtemp(prefix='cbb-release-inspection-'))
|
||||
result = run_native_repair(target, root, inspection_only=True, stop=stop)
|
||||
if not confirmed_inspection(target, result) or result['status'] != 'NOT_IN_USE':
|
||||
raise LibraryBusy(f'目标数据库未确认释放:{target.database};检查证据:{root}')
|
||||
results.append(result)
|
||||
return results
|
||||
@@ -8,7 +8,7 @@ import re
|
||||
ERROR_CODE = 'ICDB_REPAIR_REQUIRED'
|
||||
LOG_LIMIT = 128 * 1024
|
||||
RECOVERY_ACTION = (
|
||||
'停止受影响工程的写入并确认原服务器及其他客户端已正常关闭;保留完整一致副本后,'
|
||||
'停止批次并确认原服务器及其他客户端已正常关闭;保留完整一致副本后,'
|
||||
"使用同版本 iCDB Project Backup 的 Repair project 检查并修复正确目标。"
|
||||
'共享符号库问题需核对中心库,不能只修复单个 CBB 的 Work 工程。'
|
||||
'不要删除 sAddress.adr/锁文件;修复后重新打开、校验并确认权威 READY。'
|
||||
@@ -16,9 +16,6 @@ RECOVERY_ACTION = (
|
||||
_SESSION_LOSS = re.compile(
|
||||
r'\bthe\s+last\s+server\s+session\s+on\s+different\s+server\s+machine\s+'
|
||||
r'lost\s+the\s+connection\s+to\s+the\s+database\b', re.IGNORECASE)
|
||||
_INCONSISTENT = re.compile(
|
||||
r"Project database \[([^\]\r\n]+)\] is inconsistent\. It has been manually copied while the iCDB Server was running\.\s*"
|
||||
r"Please use iCDB Project Backup 'Repair project' functionality to fix this issue\.", re.I)
|
||||
|
||||
_ICDB_MESSAGE = re.compile(r'(?<![A-Za-z0-9_])icdb(?![A-Za-z0-9_.\\/])', re.I)
|
||||
_FAILURE_MESSAGE = re.compile(
|
||||
@@ -81,25 +78,11 @@ def parse_session_loss(text):
|
||||
return record
|
||||
|
||||
|
||||
def parse_recovery_request(text):
|
||||
record = parse_session_loss(text)
|
||||
if record is not None:
|
||||
return record
|
||||
match = _INCONSISTENT.search(str(text or ''))
|
||||
if match is not None:
|
||||
shared = 'symbollibs' in ntpath.normpath(match[1]).casefold().split('\\')
|
||||
return {'error_code': ERROR_CODE, 'kind': 'database_inconsistent',
|
||||
'native_message': match[0], 'database_path': match[1], 'scope': 'central_library' if shared else 'project',
|
||||
'machine': '', 'session': ''}
|
||||
return None
|
||||
|
||||
|
||||
def recovery_detail(record):
|
||||
target = ('中心库共享符号数据库' if record['scope'] == 'central_library' else
|
||||
'工程数据库' if record['scope'] == 'project' else '报错中指定的数据库')
|
||||
reason = '数据库副本不一致' if record.get('kind') == 'database_inconsistent' else '上次服务器会话失联'
|
||||
return (
|
||||
f"{ERROR_CODE}: {target}{reason};发现问题,未修复。\n"
|
||||
f"{ERROR_CODE}: {target}的上次服务器会话失联。\n"
|
||||
f"{record['native_message']}\n"
|
||||
f'{RECOVERY_ACTION}'
|
||||
)
|
||||
@@ -117,8 +100,7 @@ def snapshot_log(path):
|
||||
return {'size': size, 'tail_sha256': hashlib.sha256(tail).hexdigest(),
|
||||
'truncated': size > LOG_LIMIT,
|
||||
'icdb_errors': [' '.join(message.split()) for message in _icdb_error_paragraphs(decode_log(tail))],
|
||||
'session_losses': losses,
|
||||
'inconsistent_databases': [match[1] for match in _INCONSISTENT.finditer(decode_log(tail))]}
|
||||
'session_losses': losses}
|
||||
except FileNotFoundError:
|
||||
return {'size': 0, 'tail_sha256': hashlib.sha256(b'').hexdigest(), 'icdb_errors': []}
|
||||
except OSError as error:
|
||||
@@ -179,12 +161,6 @@ def read_log_failure(path, baseline):
|
||||
historical = baseline.get('session_losses', []) if baseline else []
|
||||
recovery = next((record for record in _session_losses(text)
|
||||
if appended or _session_identity(record) not in historical), None)
|
||||
if recovery is None:
|
||||
old = baseline.get('inconsistent_databases') if baseline else None
|
||||
match = next((match for match in _INCONSISTENT.finditer(text)
|
||||
if appended or old is not None and match[1] not in old), None)
|
||||
if match is not None:
|
||||
recovery = parse_recovery_request(match[0])
|
||||
return text, recovery
|
||||
|
||||
|
||||
|
||||
@@ -109,7 +109,6 @@ def refresh_integration(pi, *, emit=lambda **event: None, settle_seconds=5, time
|
||||
emit(stage='integration_action_unavailable', action=method,
|
||||
initial_status=state[name], reason='mentor_not_allowed')
|
||||
raise IntegrationError(f'{name}: required but not allowed')
|
||||
check_error() # The permission getter itself can block past cancellation.
|
||||
emit(stage='integration_action', action=method, initial_status=state[name],
|
||||
reason='required_verification' if name not in executed else 'resynchronize')
|
||||
started = clock()
|
||||
|
||||
@@ -11,28 +11,6 @@ from uuid import uuid4
|
||||
|
||||
_guard = threading.RLock()
|
||||
_owners = {}
|
||||
_library_guards = {}
|
||||
|
||||
|
||||
def _library_guard(key):
|
||||
"""Serialize one lease without making slow resource probes global."""
|
||||
with _guard:
|
||||
return _library_guards.setdefault(key, threading.RLock())
|
||||
|
||||
|
||||
def duplicate_worker_lease(library, process_handle):
|
||||
"""Keep the exact admitted exclusive file object alive across parent exit."""
|
||||
import win32api, win32con
|
||||
lease = LibraryLock(library)
|
||||
with _library_guard(lease.key):
|
||||
owner = _owners.get(lease.key)
|
||||
if owner is None:
|
||||
return None
|
||||
if owner['thread'] != threading.get_ident() or owner['retained'] or not owner['depth']:
|
||||
raise LibraryBusy('不能将其他任务的库锁交给工作进程。')
|
||||
remote = win32api.DuplicateHandle(win32api.GetCurrentProcess(), owner['handle'],
|
||||
process_handle, 0, False, win32con.DUPLICATE_SAME_ACCESS)
|
||||
return remote.Detach() # This handle belongs to the target process only.
|
||||
|
||||
|
||||
class LibraryBusy(OSError):
|
||||
@@ -104,21 +82,8 @@ def has_retained_library(library):
|
||||
return bool(owner and owner['retained'])
|
||||
|
||||
|
||||
def recheck_previous_release(library, evidence_dir, *, block_name=None, required=False, progress=None, stop=None):
|
||||
def recheck_previous_release(library, evidence_dir, *, block_name=None, required=False, progress=None):
|
||||
"""Historical records trigger fresh proof, never process termination or repair."""
|
||||
if not required:
|
||||
with _library_guard(LibraryLock(library).key):
|
||||
owner = _owners.get(LibraryLock(library).key)
|
||||
marker = blocker_path(library)
|
||||
record = checkpoint_record(marker)
|
||||
if (owner and owner['thread'] == threading.get_ident() and owner['depth'] > 0
|
||||
and not owner['retained'] and not marker.with_suffix('.pending').exists()
|
||||
and record and record['lease_id'] == owner['lease_id']
|
||||
and record['pid'] == os.getpid() and record['status'] == 'OPERATION_IN_PROGRESS'
|
||||
and record.get('block_name') == owner.get('block_name')
|
||||
and owner.get('block_name') in (None, block_name)
|
||||
and 'export_analysis' not in record):
|
||||
return None # Nested Verify belongs to this live transaction, not a past crash.
|
||||
if not (required or has_blocker(library) or has_retained_library(library)):
|
||||
return None
|
||||
def notify(stage, **details):
|
||||
@@ -130,13 +95,10 @@ def recheck_previous_release(library, evidence_dir, *, block_name=None, required
|
||||
logging.getLogger(__name__).warning('Release progress observer failed', exc_info=True)
|
||||
notify('previous_release_check', detail='正在复核历史记录对应的实际占用')
|
||||
try:
|
||||
options = {'stop': stop} if stop is not None else {}
|
||||
proof = release_retained_library(library, evidence_dir, block_name=block_name, **options)
|
||||
proof = release_retained_library(library, evidence_dir, block_name=block_name)
|
||||
except Exception as error:
|
||||
notify('previous_release_unconfirmed', detail=str(error))
|
||||
raise
|
||||
from .operation_queue import note_metadata_progress
|
||||
note_metadata_progress()
|
||||
notify('previous_release_confirmed', release_proof=proof,
|
||||
detail='已确认会话释放并归档历史记录;这不表示历史数据已恢复')
|
||||
return proof
|
||||
@@ -153,14 +115,9 @@ def _persist_blocker(library, status='OWNER_RELEASE_UNCONFIRMED', *, lease_id, b
|
||||
export_record['block_name'] = block_name
|
||||
elif previous and previous['lease_id'] == lease_id and 'block_name' in previous:
|
||||
export_record['block_name'] = previous['block_name']
|
||||
from .icdb_ownership import session_resource_scope
|
||||
scope = (previous.get('resource_scope') if previous and previous['lease_id'] == lease_id else None)
|
||||
scope = scope or session_resource_scope({'library': library, 'block': export_record.get('block_name')})
|
||||
with pending.open('w', encoding='utf-8') as stream:
|
||||
json.dump({**export_record, 'protocol': 'cbb-refresh-verify-library-lease', 'version': 1,
|
||||
'lease_id': lease_id, 'library': str(library), 'status': status,
|
||||
'lease_state': 'ACTIVE' if status == 'OPERATION_IN_PROGRESS' else 'RETAINED',
|
||||
'resource_scope': scope, 'blocked_resources': [], 'data_recovery_required': None,
|
||||
'machine': socket.gethostname(),
|
||||
'supervisor_created': win32process.GetProcessTimes(win32api.GetCurrentProcess())['CreationTime'].isoformat(),
|
||||
'pid': os.getpid(), 'time': datetime.now(timezone.utc).isoformat()}, stream)
|
||||
@@ -189,7 +146,7 @@ class LibraryLock:
|
||||
return lease
|
||||
|
||||
def __enter__(self):
|
||||
with _library_guard(self.key):
|
||||
with _guard:
|
||||
owner = _owners.get(self.key)
|
||||
if owner and owner['retained'] and owner['depth'] == 0 and owner.get('release_probe'):
|
||||
try:
|
||||
@@ -210,7 +167,7 @@ class LibraryLock:
|
||||
if self.maintenance_guard is not None:
|
||||
return _enter_maintenance(self)
|
||||
import win32con, win32file
|
||||
with _library_guard(self.key):
|
||||
with _guard:
|
||||
owner = _owners.get(self.key)
|
||||
if owner:
|
||||
if owner['thread'] != threading.get_ident() or owner['retained']:
|
||||
@@ -276,7 +233,7 @@ class LibraryLock:
|
||||
self.maintenance_mutex = None
|
||||
|
||||
def _exit_owned(self):
|
||||
with _library_guard(self.key):
|
||||
with _guard:
|
||||
if not self.entered:
|
||||
return
|
||||
owner = _owners[self.key]
|
||||
@@ -405,32 +362,17 @@ def _owner_matches_scope(item, library, roots):
|
||||
return False if candidates else None
|
||||
|
||||
|
||||
def _owner_is_blocking(item, library, roots):
|
||||
"""Unknown external clients need resource proof, not a global exit rule."""
|
||||
scope = _owner_matches_scope(item, library, roots)
|
||||
if scope is not None:
|
||||
return scope
|
||||
command = str(item.get('command') or '').casefold()
|
||||
flags = ('--verify-worker', '--repair-worker', '--management-worker', '--native-backup-worker')
|
||||
if any(flag in command for flag in flags):
|
||||
return True # An unreadable in-flight request is not proof of another library.
|
||||
from .failed_session import _command_args
|
||||
try:
|
||||
return any(Path(arg).name.casefold() in ('close_failed_block.vbs', 'save_verified_block.vbs')
|
||||
for arg in _command_args(command)[1:])
|
||||
except (OSError, ValueError):
|
||||
return False
|
||||
|
||||
|
||||
def _enter_maintenance(lease):
|
||||
"""Transfer only a valid known lease, after project admission under lock."""
|
||||
import win32con, win32file
|
||||
from .operation_queue import check_active
|
||||
import win32con, win32event, win32file
|
||||
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
|
||||
acquired = False
|
||||
handle = None
|
||||
existing = None
|
||||
try:
|
||||
check_active()
|
||||
with _library_guard(lease.key):
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired: raise LibraryBusy('已有 CBB 操作运行,维护不能接续')
|
||||
with _guard:
|
||||
marker = blocker_path(lease.library)
|
||||
if marker.with_suffix('.pending').exists():
|
||||
raise LibraryBusy('未完成检查点写入,不能自动接续')
|
||||
@@ -464,7 +406,6 @@ def _enter_maintenance(lease):
|
||||
with saved.open('xb') as stream:
|
||||
stream.write(old); stream.flush(); os.fsync(stream.fileno())
|
||||
if saved.read_bytes() != old: raise OSError('原检查点归档校验失败')
|
||||
check_active()
|
||||
lease_id = uuid4().hex
|
||||
_persist_blocker(lease.library, 'OPERATION_IN_PROGRESS', lease_id=lease_id)
|
||||
_owners[lease.key] = {'thread': threading.get_ident(), 'depth': 1, 'handle': handle,
|
||||
@@ -472,16 +413,19 @@ def _enter_maintenance(lease):
|
||||
'release_probe': lease.safe_to_release, 'block_name': None}
|
||||
lease.maintenance_proof = proof
|
||||
lease.entered = True
|
||||
lease.maintenance_mutex = mutex
|
||||
return lease
|
||||
except Exception:
|
||||
if handle is not None and existing is None: handle.Close()
|
||||
if acquired: win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
raise
|
||||
|
||||
|
||||
def owned_snapshot(path):
|
||||
"""Read only a lease held by this thread, never reopen an exclusive file."""
|
||||
import win32con, win32file
|
||||
with _library_guard(_key(path)):
|
||||
with _guard:
|
||||
owner = _owners.get(_key(path))
|
||||
if not owner or owner['thread'] != threading.get_ident() or owner['retained']:
|
||||
return None
|
||||
@@ -496,17 +440,19 @@ def owned_snapshot(path):
|
||||
|
||||
|
||||
@contextmanager
|
||||
def _prove_library_released(library, block_name=None, *, block_names=(), allow_unknown_checkpoint=False, stop=None):
|
||||
def _prove_library_released(library, block_name=None, *, allow_unknown_checkpoint=False):
|
||||
"""Hold all native database read handles during explicit lease release."""
|
||||
from .operation_queue import note_metadata_progress
|
||||
import stat
|
||||
import win32con, win32file
|
||||
from .owner_probe import query_owners
|
||||
from .scoped_manifest import scan_tree
|
||||
from .native_management import _retained_workers
|
||||
from .native_export_guard import assert_retained_exports_idle, prove_export_copies_released
|
||||
from .native_engineering_identity import _OWNER_NAMES
|
||||
library = Path(library).resolve()
|
||||
assert_retained_exports_idle(library)
|
||||
if any(worker.poll() is None and (not getattr(worker, 'cbb_library', None)
|
||||
or _key(worker.cbb_library) == _key(library))
|
||||
if any(worker.poll() is None and (allow_unknown_checkpoint
|
||||
or not getattr(worker, 'cbb_library', None) or _key(worker.cbb_library) == _key(library))
|
||||
for worker in _retained_workers):
|
||||
raise LibraryBusy('原生管理工作进程尚未返回,不能解除协调阻止。')
|
||||
from .com_runtime import initialize_com, uninitialize_com
|
||||
@@ -516,30 +462,19 @@ def _prove_library_released(library, block_name=None, *, block_names=(), allow_u
|
||||
'iCDBProjectBackup.exe', 'ReuseBlockImporter.exe', 'CleanWGLib.exe',
|
||||
'cscript.exe', 'wscript.exe', 'python.exe', 'pythonw.exe',
|
||||
'CbbRefreshVerify.exe', *sorted(_OWNER_NAMES))
|
||||
blocks = tuple(dict.fromkeys(block_names or ((block_name,) if block_name else ())))
|
||||
if any(not name or name in ('.', '..') or any(c in name for c in '\\/:*?"<>|') for name in blocks):
|
||||
raise ValueError('释放检查的工程名称无效')
|
||||
scope_roots = tuple(library.parent/'ReusableBlocksLP'/name/'Work' for name in blocks)
|
||||
scope_root = (Path(library).resolve().parent/'ReusableBlocksLP'/block_name/'Work').resolve() if block_name else None
|
||||
shared_root = Path(library).resolve().parent/'SymbolLibs'
|
||||
if allow_unknown_checkpoint and scope_roots:
|
||||
if allow_unknown_checkpoint and scope_root is not None:
|
||||
raise LibraryBusy('未知检查点必须执行完整库释放证明。')
|
||||
observed = []
|
||||
def check_owners():
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('已停止释放检查')
|
||||
owners = []
|
||||
observed.clear()
|
||||
from .session_record import active_write_records
|
||||
if active_write_records(library):
|
||||
raise LibraryBusy('本库原生调用或助手尚未确认返回,请等待当前操作结束。')
|
||||
for item in query_owners(names):
|
||||
if item['pid'] == os.getpid():
|
||||
continue
|
||||
roots = (*scope_roots, shared_root) if scope_roots else (library.parent,)
|
||||
if not _owner_is_blocking(item, library, roots):
|
||||
if _owner_matches_scope(item, library, roots) is None:
|
||||
observed.append(item)
|
||||
continue
|
||||
if not allow_unknown_checkpoint:
|
||||
roots = (scope_root, shared_root) if scope_root is not None else (Path(library).parent,)
|
||||
if _owner_matches_scope(item, library, roots) is False:
|
||||
continue
|
||||
automation = item['name'].casefold() in ('python.exe', 'pythonw.exe', 'cbbrefreshverify.exe')
|
||||
command = item['command'].casefold()
|
||||
if not automation or not command or any(flag in command for flag in (
|
||||
@@ -547,80 +482,64 @@ def _prove_library_released(library, block_name=None, *, block_names=(), allow_u
|
||||
owners.append(item)
|
||||
if owners:
|
||||
raise LibraryBusy(f'原生进程仍存在,不能解除协调阻止:{owners}')
|
||||
note_metadata_progress()
|
||||
return owners
|
||||
check_owners()
|
||||
from .file_probe import hold_release_files
|
||||
roots = (*scope_roots, shared_root) if scope_roots else None
|
||||
inspections = []
|
||||
if scope_root is None:
|
||||
entries = scan_tree(Path(library).parent)
|
||||
else:
|
||||
entries = {Path(library): Path(library).lstat()}
|
||||
for root in (scope_root, shared_root):
|
||||
if root.exists():
|
||||
entries.update(scan_tree(root))
|
||||
addresses = [str(path) for path in entries if path.name.casefold() == 'saddress.adr'
|
||||
and (scope_root is None or path.is_relative_to(scope_root)
|
||||
or path.is_relative_to(shared_root))]
|
||||
if addresses:
|
||||
raise LibraryBusy(f'库中仍有数据库地址记录,不能自动解除:{addresses}')
|
||||
# scan_tree already rejects links; only native candidates need file opens.
|
||||
native = [path for path, metadata in entries.items() if stat.S_ISREG(metadata.st_mode) and (
|
||||
path == library
|
||||
or (path.name.casefold() in ('icdb.dat', 'layoutdb.lyt')
|
||||
and (scope_root is None or path.is_relative_to(scope_root)
|
||||
or path.is_relative_to(shared_root))))]
|
||||
if library not in native:
|
||||
raise LibraryBusy('目标库身份缺失,不能解除协调阻止。')
|
||||
with ExitStack() as stack:
|
||||
try:
|
||||
files = stack.enter_context(hold_release_files(library, roots, stop=stop))
|
||||
except OSError as error:
|
||||
blocked = LibraryBusy(str(error))
|
||||
blocked.winerror = getattr(error, 'winerror', None)
|
||||
raise blocked from error
|
||||
note_metadata_progress()
|
||||
if files['addresses']:
|
||||
# Native inspection needs the database; reacquire proof handles
|
||||
# and compare the exact address/project binding before commit.
|
||||
stack.close()
|
||||
from .icdb_ownership import inspect_release_addresses
|
||||
# Checkpoint I/O is per-library; only native inspection owns
|
||||
# the host channel. The sidecar still excludes other writers.
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('已停止释放检查')
|
||||
inspections = inspect_release_addresses(files, stop=stop)
|
||||
try:
|
||||
current = stack.enter_context(hold_release_files(library, roots, stop=stop))
|
||||
except OSError as error:
|
||||
blocked = LibraryBusy(str(error))
|
||||
blocked.winerror = getattr(error, 'winerror', None)
|
||||
raise blocked from error
|
||||
if any(current[key] != files[key] for key in (
|
||||
'exclusive_files', 'addresses', 'signatures', 'inspection_targets')):
|
||||
raise LibraryBusy('原生检查期间资源范围或地址身份变化。')
|
||||
files = current
|
||||
note_metadata_progress()
|
||||
export_proof = (prove_export_copies_released(library, allow_unknown_checkpoint=True)
|
||||
if allow_unknown_checkpoint else prove_export_copies_released(library))
|
||||
export_copies = stack.enter_context(export_proof)
|
||||
for path in native:
|
||||
handle = win32file.CreateFile(str(path), win32con.GENERIC_READ, 0, None,
|
||||
win32con.OPEN_EXISTING, win32con.FILE_ATTRIBUTE_NORMAL, None)
|
||||
stack.callback(handle.Close)
|
||||
owners = check_owners()
|
||||
yield {**{k: v for k, v in files.items() if k not in ('status', 'token')},
|
||||
'native_owners': owners, 'observed_owners': list(observed),
|
||||
'export_copies': export_copies, 'native_inspections': inspections,
|
||||
'data_recovery_required': any(item['repair_required'] for item in inspections) if inspections else None,
|
||||
'data_recovery_resources': [item['database'] for item in inspections if item['repair_required']],
|
||||
'unknown_checkpoint_recovery': allow_unknown_checkpoint}
|
||||
|
||||
yield {'native_owners': owners, 'addresses': addresses, 'export_copies': export_copies,
|
||||
'unknown_checkpoint_recovery': allow_unknown_checkpoint,
|
||||
'exclusive_files': [str(path) for path in native]}
|
||||
finally:
|
||||
uninitialize_com(initialized)
|
||||
|
||||
|
||||
def release_retained_library(library, evidence_dir, *, block_name=None, block_names=(), stop=None):
|
||||
def release_retained_library(library, evidence_dir, *, block_name=None):
|
||||
"""Reconcile historical leases after fresh owner/address/access proof.
|
||||
|
||||
The upload sidecar is never deleted. This acknowledges process release,
|
||||
not the correctness of a partially changed library or its recovery state.
|
||||
"""
|
||||
import win32con, win32file
|
||||
from .operation_queue import note_metadata_progress
|
||||
import win32con, win32event, win32file
|
||||
library = Path(library).resolve(strict=True)
|
||||
from .session_record import (retained_session_snapshot, acknowledge_library_release,
|
||||
reconciled_retained_sessions)
|
||||
retained = retained_session_snapshot(library)
|
||||
requested_blocks = tuple(dict.fromkeys(block_names or ((block_name,) if block_name else ())))
|
||||
if any(not name or name in ('.', '..') or any(c in name for c in '\\/:*?"<>|') for name in requested_blocks):
|
||||
raise ValueError('释放检查的工程名称无效')
|
||||
evidence = Path(evidence_dir).resolve()
|
||||
if evidence.is_relative_to(library.parent) or library.parent.is_relative_to(evidence):
|
||||
raise ValueError('释放检查证据必须位于目标库之外。')
|
||||
lease = LibraryLock(library)
|
||||
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
|
||||
acquired = False
|
||||
external = None
|
||||
try:
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('已停止释放检查')
|
||||
with _library_guard(lease.key):
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired:
|
||||
raise LibraryBusy('另一个 CBB 操作仍在运行。')
|
||||
with _guard:
|
||||
owner = _owners.get(lease.key)
|
||||
if owner and (not owner['retained'] or owner['depth']):
|
||||
raise LibraryBusy('本应用操作仍在使用库锁。')
|
||||
@@ -638,63 +557,22 @@ def release_retained_library(library, evidence_dir, *, block_name=None, block_na
|
||||
before = {path: path.read_bytes() if path.exists() else None for path in checkpoints}
|
||||
unknown = any(data is not None and checkpoint_record(path) is None for path, data in before.items())
|
||||
records = [checkpoint_record(path) for path, data in before.items() if data is not None]
|
||||
scoped_blocks = (requested_blocks if requested_blocks and all(record
|
||||
and record.get('block_name') in requested_blocks for record in records)
|
||||
and (owner is None or owner.get('block_name') in requested_blocks) else ())
|
||||
scoped = scoped_blocks[0] if len(scoped_blocks) == 1 else None
|
||||
reconciled = [{'kind': 'checkpoint', 'path': str(path), 'recognized': metadata is not None,
|
||||
**{key: (metadata or {}).get(key) for key in ('block_name', 'lease_id', 'pid', 'status', 'time')}}
|
||||
for path, data in before.items() if data is not None
|
||||
for metadata in (checkpoint_record(path),)]
|
||||
if owner:
|
||||
reconciled.append({'kind': 'retained_owner', 'path': str(lease.path),
|
||||
'block_name': owner.get('block_name'), 'lease_id': owner['lease_id'],
|
||||
'status': 'OWNER_RELEASE_UNCONFIRMED'})
|
||||
foreign = sorted({item['block_name'] for item in reconciled
|
||||
if block_name and item.get('block_name') and item['block_name'] != block_name})
|
||||
options = {'stop': stop} if stop is not None else {}
|
||||
if len(scoped_blocks) > 1:
|
||||
options['block_names'] = scoped_blocks
|
||||
proof_context = (_prove_library_released(library, allow_unknown_checkpoint=True, **options) if unknown else
|
||||
_prove_library_released(library, block_name=scoped, **options)
|
||||
if scoped else _prove_library_released(library, **options))
|
||||
scoped = (block_name if block_name and all(record and record.get('block_name') == block_name
|
||||
for record in records) and (owner is None or owner.get('block_name') == block_name) else None)
|
||||
proof_context = (_prove_library_released(library, allow_unknown_checkpoint=True) if unknown else
|
||||
_prove_library_released(library, block_name=scoped)
|
||||
if scoped else _prove_library_released(library))
|
||||
with proof_context as proof:
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('已停止释放检查')
|
||||
with _guard:
|
||||
if _owners.get(lease.key) is not owner:
|
||||
raise LibraryBusy('释放检查期间租约身份变化,保留当前任务。')
|
||||
if unknown and proof.get('unknown_checkpoint_recovery') is not True:
|
||||
raise LibraryBusy('未知检查点缺少完整库释放证明,保留原文件。')
|
||||
if any((path.read_bytes() if path.exists() else None) != data for path, data in before.items()):
|
||||
raise LibraryBusy('释放检查期间协调检查点变化,保留原文件。')
|
||||
root = evidence/('release-' + uuid4().hex)
|
||||
root.mkdir(parents=True, exist_ok=False)
|
||||
matching_retained = ({path: value for path, value in retained.items()
|
||||
if value[1] in scoped_blocks} if scoped_blocks else retained)
|
||||
reconciled_sessions = reconciled_retained_sessions(matching_retained, block_name=scoped)
|
||||
reconciled_blocks = sorted({item['block_name'] for item in (*reconciled, *reconciled_sessions)
|
||||
if item.get('block_name')})
|
||||
record = {'library': str(library), 'status': 'RELEASE_CONFIRMED', **proof,
|
||||
'requested_block_name': block_name, 'requested_block_names': list(requested_blocks),
|
||||
'proof_scope': 'BLOCK' if scoped else 'BLOCKS' if scoped_blocks else 'LIBRARY',
|
||||
'proof_block_name': scoped, 'proof_block_names': list(scoped_blocks),
|
||||
'reconciled_checkpoints': reconciled,
|
||||
'reconciled_foreign_blockers': sorted(set(foreign) | {
|
||||
block for block in reconciled_blocks if block_name and block != block_name}),
|
||||
'reconciled_blocks': reconciled_blocks, 'reconciled_sessions': reconciled_sessions,
|
||||
'unknown_checkpoint_archived': unknown,
|
||||
'lease_state': 'RELEASED', 'blocked_resources': [],
|
||||
'data_recovery_required': proof.get('data_recovery_required', None),
|
||||
'data_recovery_confirmed': False, 'evidence_path': str(root/'release.json')}
|
||||
record['resource_scope'] = {**proof.get('resource_scope', {}),
|
||||
'scope_state': 'OBSERVED', 'library': str(library), 'block_name': scoped,
|
||||
'block_names': list(scoped_blocks),
|
||||
'lease_id': owner['lease_id'] if owner else None,
|
||||
'operation_ids': [item['operation_id'] for item in reconciled_sessions]}
|
||||
pending = {**record, 'status': 'RELEASE_PENDING', 'lease_state': 'PENDING'}
|
||||
(root/'release.json').write_text(json.dumps(pending, ensure_ascii=False, indent=2), encoding='utf-8')
|
||||
note_metadata_progress()
|
||||
(root/'release.json').write_text(json.dumps(record, ensure_ascii=False, indent=2), encoding='utf-8')
|
||||
for index, checkpoint in enumerate(checkpoints):
|
||||
if checkpoint.exists():
|
||||
data = checkpoint.read_bytes()
|
||||
@@ -702,16 +580,14 @@ def release_retained_library(library, evidence_dir, *, block_name=None, block_na
|
||||
archived.write_bytes(data)
|
||||
if archived.read_bytes() != data:
|
||||
raise OSError('阻止记录归档校验失败,保持库锁。')
|
||||
note_metadata_progress()
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('已停止释放检查')
|
||||
checkpoint.unlink() # Checkpoint JSON only; never .lock.
|
||||
if owner:
|
||||
owner['handle'].Close()
|
||||
del _owners[lease.key]
|
||||
(root/'release.json').write_text(json.dumps(record, ensure_ascii=False, indent=2), encoding='utf-8')
|
||||
acknowledge_library_release(record, matching_retained, block_name=scoped)
|
||||
return record
|
||||
finally:
|
||||
if external is not None:
|
||||
external.Close()
|
||||
if acquired:
|
||||
win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
@@ -203,22 +203,20 @@ def filesystem_status_map(library: Path, names):
|
||||
return {name: details['status'] for name, details in filesystem_evidence_map(library, names).items()}
|
||||
|
||||
def read_library_fast(path: Path, *, status_reader=None):
|
||||
"""Discover directories; this does not validate native format/registration."""
|
||||
"""List CBBs from ReusableBlocksLP without touching COM or the .lmc.
|
||||
|
||||
Useful when Library Manager is unavailable or already running: the folder
|
||||
is the same source the LM tree shows, and an optional status_reader can
|
||||
supply each item's flag without a full COM session.
|
||||
"""
|
||||
try:
|
||||
path = Path(path)
|
||||
if path.suffix.casefold() != '.lmc':
|
||||
return LibraryReadResult((), 'INPUT_SUFFIX: 请选择 .lmc 中心库文件。')
|
||||
if not path.is_file():
|
||||
return LibraryReadResult((), f'INPUT_MISSING: 中心库不存在或不是文件: {path}')
|
||||
with path.open('rb') as stream:
|
||||
if not stream.read(1):
|
||||
return LibraryReadResult((), 'INPUT_EMPTY: 中心库文件为空。')
|
||||
if any(lock.is_dir() for lock in (path.with_suffix('.lock'), path.with_name('.'+path.stem+'.cbb-upload.lock'))):
|
||||
return LibraryReadResult((), 'INPUT_LOCK_DIRECTORY: 中心库锁路径是目录。')
|
||||
return LibraryReadResult((), f'中心库不存在: {path}')
|
||||
folder = path.parent/'ReusableBlocksLP'
|
||||
if folder.exists() and not folder.is_dir():
|
||||
return LibraryReadResult((), f'INPUT_DIRECTORY: ReusableBlocksLP 不是目录: {folder}')
|
||||
entries = [entry for entry in folder.iterdir() if entry.is_dir()] if folder.is_dir() else []
|
||||
if not folder.is_dir():
|
||||
return LibraryReadResult((), f'缺少 ReusableBlocksLP 目录: {folder}')
|
||||
entries = [entry for entry in folder.iterdir() if entry.is_dir()]
|
||||
names = tuple(sorted((entry.name for entry in entries), key=str.casefold))
|
||||
statuses = {}
|
||||
if status_reader is not None and names:
|
||||
@@ -242,11 +240,8 @@ def read_library_fast(path: Path, *, status_reader=None):
|
||||
status = str(statuses.get(entry.name, 'UNKNOWN') or 'UNKNOWN')
|
||||
if status not in {'READY', 'PENDING', 'UNKNOWN', 'UNAVAILABLE', 'ERROR', 'TIMEOUT'}:
|
||||
status = 'UNKNOWN'
|
||||
records.append(CbbRecord(entry.name, 'Reusable Blocks', status=status,
|
||||
catalog_source='directory', status_source='status_reader' if status_reader else 'unknown'))
|
||||
return LibraryReadResult(tuple(sorted(records, key=lambda item: item.name)), directory_count=len(entries))
|
||||
except PermissionError as error:
|
||||
return LibraryReadResult((), f'INPUT_PERMISSION: 无权读取中心库: {error}')
|
||||
records.append(CbbRecord(entry.name, 'Reusable Blocks', status=status))
|
||||
return LibraryReadResult(tuple(sorted(records, key=lambda item: item.name)))
|
||||
except Exception as error:
|
||||
return LibraryReadResult((), str(error))
|
||||
|
||||
@@ -289,8 +284,9 @@ def scan_open_library_status(library: Path, names, *, tree_image_reader=None,
|
||||
image_status_map=image_status_map)
|
||||
status = reconcile_statuses(tree_statuses, fallback, names)
|
||||
uncalibrated = [name for name in names if status.get(name, 'UNKNOWN') == 'UNKNOWN']
|
||||
# Missing observations remain unknown; eligibility is decided by the caller.
|
||||
effective = {name: (value if tree_images.get(name) is not None else 'UNKNOWN')
|
||||
# The UI must never use UNKNOWN as a skip signal. Queue it as Pending
|
||||
# so it receives the real Verify flow instead of being silently omitted.
|
||||
effective = {name: ('PENDING' if value == 'UNKNOWN' else value)
|
||||
for name, value in status.items()}
|
||||
logger.info(
|
||||
'library_status_sources names=%s image_histogram=%s current_image_map=%s cached_image_map=%s image_status_map=%s cache_actions=%s filesystem=%s calibrated_tree=%s final=%s uncalibrated_sample=%s conflicts=%s ready_anchor_ids=%s unseen_tree_ids=%s',
|
||||
@@ -332,14 +328,46 @@ def scan_open_library_status(library: Path, names, *, tree_image_reader=None,
|
||||
return effective
|
||||
|
||||
try:
|
||||
if tree_image_reader is None:
|
||||
from .mentor_adapter import read_library_tree_image_map
|
||||
tree_image_reader = read_library_tree_image_map
|
||||
return finish(tree_image_reader(library, names))
|
||||
from pywinauto import Desktop
|
||||
from pywinauto.controls.common_controls import TreeViewWrapper
|
||||
from cbb_refresh_verify.mentor_adapter import _tree_image, same_path
|
||||
target = None
|
||||
for window in Desktop(backend='win32').windows():
|
||||
title = window.window_text()
|
||||
if title.startswith('Library Manager:') and same_path(title.split(':', 1)[1].strip(), library):
|
||||
target = window
|
||||
break
|
||||
if target is None:
|
||||
if tree_image_reader is None:
|
||||
from cbb_refresh_verify.mentor_adapter import read_library_tree_image_map
|
||||
tree_image_reader = read_library_tree_image_map
|
||||
return finish(tree_image_reader(library, names))
|
||||
trees = [w for w in target.descendants() if 'TreeView' in w.class_name()]
|
||||
if len(trees) != 1:
|
||||
return finish({})
|
||||
tree = TreeViewWrapper(trees[0].handle)
|
||||
root_name = Path(library).name
|
||||
images = {}
|
||||
missing = []
|
||||
for name in names:
|
||||
try:
|
||||
item = tree.get_item(['Central Libraries', root_name, 'Reusable Blocks', 'Logical-Physical', name], exact=True)
|
||||
from cbb_refresh_verify.mentor_adapter import _tree_image_details
|
||||
details = _tree_image_details(item, tree)
|
||||
images[name] = details['image_id']
|
||||
logger.info('library_tree_image_item name=%s image_id=%s selected_image_id=%s state_image_id=%s image_color=%s selected_image_color=%s state_image_color=%s',
|
||||
name, details['image_id'], details['selected_image_id'],
|
||||
details['state_image_id'], details['image_color'],
|
||||
details['selected_image_color'], details['state_image_color'])
|
||||
except Exception:
|
||||
images[name] = None
|
||||
missing.append(name)
|
||||
logger.info('library_tree_image_probe requested=%s read=%s missing=%s',
|
||||
len(names), len(names) - len(missing), missing[:20])
|
||||
return finish(images)
|
||||
except Exception as error:
|
||||
logger.warning('library_status_probe_failed path=%s error=%s', library, error)
|
||||
return {name: 'UNKNOWN' for name in names}
|
||||
|
||||
return finish({})
|
||||
|
||||
|
||||
def read_library(path: Path, *, dispatch=None):
|
||||
|
||||
@@ -19,25 +19,22 @@ def assert_native_idle(target=None):
|
||||
from .native_export_guard import assert_retained_exports_idle
|
||||
from .native_engineering_identity import _OWNER_NAMES
|
||||
from .library_lock import _key, _owner_matches_scope
|
||||
library = Path(target.library) if target is not None and getattr(target, 'library', None) else None
|
||||
library = None
|
||||
roots = ()
|
||||
if target is not None:
|
||||
from .backup_recovery import _project_text
|
||||
roots = (Path(target.project).parent, Path(target.database))
|
||||
if library is not None:
|
||||
roots += (library.parent/'SymbolLibs',)
|
||||
else:
|
||||
try:
|
||||
lines = re.findall(r'^KEY CentralLibrary\b[^\r\n]*', _project_text(target.project), re.M)
|
||||
references = [re.fullmatch(r'KEY CentralLibrary "([^"\r\n]+)"\s*', line) for line in lines]
|
||||
if not references or any(match is None for match in references):
|
||||
raise ValueError('CentralLibrary references are missing or invalid.')
|
||||
libraries = {(Path(target.project).parent/match[1]).resolve(strict=True) for match in references}
|
||||
if len(libraries) == 1 and all(path.suffix.casefold() == '.lmc' and path.is_file() for path in libraries):
|
||||
library = libraries.pop()
|
||||
roots += (library.parent/'SymbolLibs',)
|
||||
except (OSError, ValueError):
|
||||
pass # Missing/ambiguous original references cannot narrow retained ownership.
|
||||
try:
|
||||
lines = re.findall(r'^KEY CentralLibrary\b[^\r\n]*', _project_text(target.project), re.M)
|
||||
references = [re.fullmatch(r'KEY CentralLibrary "([^"\r\n]+)"\s*', line) for line in lines]
|
||||
if not references or any(match is None for match in references):
|
||||
raise ValueError('CentralLibrary references are missing or invalid.')
|
||||
libraries = {(Path(target.project).parent/match[1]).resolve(strict=True) for match in references}
|
||||
if len(libraries) == 1 and all(path.suffix.casefold() == '.lmc' and path.is_file() for path in libraries):
|
||||
library = libraries.pop()
|
||||
roots += (library.parent/'SymbolLibs',)
|
||||
except (OSError, ValueError):
|
||||
pass # Missing/ambiguous original references cannot narrow retained ownership.
|
||||
assert_retained_exports_idle(library)
|
||||
if any(worker.poll() is None and (library is None or not getattr(worker, 'cbb_library', None)
|
||||
or _key(worker.cbb_library) == _key(library)) for worker in _retained_workers):
|
||||
|
||||
@@ -8,7 +8,7 @@ from uuid import uuid4
|
||||
|
||||
from .library_lock import LibraryLock, LibraryBusy
|
||||
from .scoped_manifest import (ManifestScope, build_manifest, build_exclusive_library_manifest,
|
||||
comparison_rules, copy_verified, hash_file, scan_tree)
|
||||
copy_verified, hash_file, scan_tree)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
@@ -169,43 +169,34 @@ def _may_have_mutated(record):
|
||||
or any(not isinstance(item, dict) or item.get('stage') not in prewrite for item in history))
|
||||
|
||||
|
||||
def run_management(request, *, adapter=None, verifier=None, idle_check=None, progress=None, stop=None, version_prompt=None,
|
||||
write_admission=None):
|
||||
def run_management(request, *, adapter=None, verifier=None, idle_check=None, progress=None):
|
||||
from .verify_runner import VerifyRequest, run_verify
|
||||
from .backup_recovery import _idle_check
|
||||
from contextlib import ExitStack
|
||||
from .operation_queue import check_active, native_channel, task_stop, remember_result
|
||||
stop = task_stop(stop)
|
||||
import win32con, win32event
|
||||
import pythoncom
|
||||
if adapter is None:
|
||||
from .native_management import NativeManagementAdapter
|
||||
adapter = NativeManagementAdapter()
|
||||
verifier = verifier or run_verify
|
||||
idle_check = idle_check or _idle_check
|
||||
root = report = None
|
||||
native_idle_check = idle_check is None
|
||||
if native_idle_check:
|
||||
from .write_admission import WriteAdmission
|
||||
write_admission=write_admission or WriteAdmission(prompt=version_prompt,stop=stop)
|
||||
idle_check=lambda library,project,pcb:_idle_check(library,project,pcb,
|
||||
confirmation=write_admission,evidence=root,block=request.name)
|
||||
stage = 'preflight'
|
||||
history = []
|
||||
mutated = uploaded = removed = False
|
||||
owner_safe = True
|
||||
mutex = None
|
||||
acquired = False
|
||||
release_proof = None
|
||||
original = None
|
||||
change_report = None
|
||||
def invoke(callback, *args):
|
||||
nonlocal owner_safe
|
||||
if stop is not None and stop.is_set():
|
||||
raise InterruptedError('MANAGEMENT_CANCELLED: 已停止后续原生操作')
|
||||
with native_channel():
|
||||
owner_safe = False
|
||||
try:
|
||||
result = callback(*args)
|
||||
except Exception as error:
|
||||
owner_safe = getattr(error, 'safe_to_continue', False) is True
|
||||
raise
|
||||
owner_safe = False
|
||||
try:
|
||||
result = callback(*args)
|
||||
except Exception as error:
|
||||
owner_safe = getattr(error, 'safe_to_continue', False) is True
|
||||
raise
|
||||
owner_safe = result.safe_to_continue
|
||||
return result
|
||||
def checkpoint(next_stage, **details):
|
||||
@@ -219,15 +210,10 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
progress({'stage': stage, 'block': request.name, 'operation': request.operation, **details})
|
||||
def finish(status, detail='', safe=True):
|
||||
nonlocal change_report
|
||||
remember_result(ManagementResult(request.operation, request.library, request.name, request.partition,
|
||||
request.source, request.auto_verify, 'complete', status, safe, detail, report, release_proof, change_report))
|
||||
if mutated and original is not None and change_report is None:
|
||||
change_report = {'status': 'UNCONFIRMED', 'scope': original['scope'],
|
||||
**comparison_rules(scope),
|
||||
'unrelated_cbb_content_checked': False,
|
||||
'detail': '原生会话尚未释放,未读取写后内容'}
|
||||
remember_result(ManagementResult(request.operation, request.library, request.name, request.partition,
|
||||
request.source, request.auto_verify, 'complete', status, safe, detail, report, release_proof, change_report))
|
||||
if safe:
|
||||
try:
|
||||
after = build_exclusive_library_manifest(library_root, scope=scope, progress=progress)
|
||||
@@ -249,20 +235,15 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
detail = (detail+'\n'+change_report['detail']).strip()
|
||||
result = ManagementResult(request.operation, request.library, request.name, request.partition,
|
||||
request.source, request.auto_verify, 'complete', status, safe, detail, report, release_proof, change_report)
|
||||
remember_result(result)
|
||||
if report:
|
||||
try:
|
||||
_write_json(report, {**asdict(result), 'history': history, 'backup_policy': 'manual'})
|
||||
except OSError as error:
|
||||
result = replace(result, detail=f'{detail}\n操作记录写入失败:{error}'.strip())
|
||||
return remember_result(result)
|
||||
return result
|
||||
from .com_runtime import initialize_com, uninitialize_com
|
||||
initialized = initialize_com()
|
||||
try:
|
||||
if stop is not None and stop.is_set():
|
||||
return finish('CANCELLED', '已取消,未启动原生管理操作')
|
||||
if hasattr(adapter, 'bind_stop'):
|
||||
adapter.bind_stop(stop)
|
||||
if request.operation not in ('add', 'update', 'remove'):
|
||||
raise ValueError('不支持的管理操作。')
|
||||
validate_name(request.name); validate_name(request.partition)
|
||||
@@ -289,8 +270,6 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
if request.operation in ('add', 'update'):
|
||||
if request.source is None:
|
||||
raise ValueError('新增/更新需要完整来源工程。')
|
||||
if hasattr(adapter, 'validate_source'):
|
||||
adapter.validate_source(request)
|
||||
source, pcb, top = source_project(request.source, request.top_level_block)
|
||||
if (source.parent.is_relative_to(library_root) or library_root.is_relative_to(source.parent)
|
||||
or evidence.is_relative_to(source.parent)
|
||||
@@ -300,30 +279,22 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
root.mkdir(parents=True, exist_ok=False)
|
||||
report = root/'checkpoint.json'
|
||||
checkpoint('release_check')
|
||||
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired:
|
||||
return finish('BLOCKED', '已有 CBB 校验/管理/恢复任务运行;本次未启动。')
|
||||
from .library_lock import recheck_previous_release
|
||||
release_proof = recheck_previous_release(library, root/'previous-release', block_name=request.name,
|
||||
required=request.check_previous_release or bool(unfinished_target
|
||||
and unfinished_target.get('safe_to_continue') is not True), progress=progress, stop=stop)
|
||||
and unfinished_target.get('safe_to_continue') is not True), progress=progress)
|
||||
if release_proof is not None:
|
||||
checkpoint('release_check', release_proof=release_proof)
|
||||
if unfinished_target:
|
||||
from .session_record import _proof_covers_session
|
||||
fresh = (request.check_previous_release and isinstance(release_proof, dict)
|
||||
and _proof_covers_session(release_proof, {'library': str(library), 'block': request.name})
|
||||
and bool(release_proof.get('evidence_path'))
|
||||
and Path(release_proof['evidence_path']).resolve().is_relative_to((root/'previous-release').resolve())
|
||||
and Path(release_proof['evidence_path']).is_file())
|
||||
if not fresh:
|
||||
return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}')
|
||||
checkpoint('release_check', confirmed_new_request=True,
|
||||
previous_failed_operation=unfinished_target['evidence_path'])
|
||||
return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}')
|
||||
if hasattr(adapter, 'bind_library_mapping'):
|
||||
adapter.bind_library_mapping(request.mapped_drive, request.mapped_remote_root)
|
||||
if hasattr(adapter,'bind_write_admission'):
|
||||
adapter.bind_write_admission(write_admission if native_idle_check else None)
|
||||
check_active()
|
||||
with LibraryLock(library, block_name=request.name, safe_to_release=lambda: owner_safe or (
|
||||
callable(getattr(adapter, 'release_confirmed', None)) and adapter.release_confirmed(library))), ExitStack() as native_stack:
|
||||
callable(getattr(adapter, 'release_confirmed', None)) and adapter.release_confirmed(library))):
|
||||
work = library.parent/'ReusableBlocksLP'/request.name/'Work'
|
||||
target_project, target_pcb = work/(request.name+'.prj'), work/'PCB/pcb.pcb'
|
||||
if request.operation != 'add':
|
||||
@@ -338,6 +309,7 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
if source:
|
||||
idle_check(library, source, pcb)
|
||||
checkpoint('catalog_before')
|
||||
owner_safe = False
|
||||
before = invoke(adapter.catalog, library, root/'before')
|
||||
owner_safe = before.safe_to_continue
|
||||
if not owner_safe or Path(before.library).resolve() != canonical_library or before.flow != 1:
|
||||
@@ -377,9 +349,6 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
if build_exclusive_library_manifest(library_root, scope=scope, progress=progress) != original:
|
||||
raise OSError('内容基线记录后中心库发生变化,停止写入。')
|
||||
if request.operation in ('remove', 'update'):
|
||||
if stop is not None and stop.is_set():
|
||||
return finish('CANCELLED', '已取消,未开始移除', owner_safe)
|
||||
native_stack.enter_context(native_channel())
|
||||
checkpoint('native_remove')
|
||||
mutated = True; owner_safe = False
|
||||
native = invoke(adapter.remove, request, root/'remove')
|
||||
@@ -396,11 +365,6 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
checkpoint('removed')
|
||||
if request.operation == 'remove':
|
||||
return finish('REMOVED', '已由原生操作移除,重新读取目录确认不存在;应用未创建备份。')
|
||||
if stop is not None and stop.is_set():
|
||||
return finish('RECOVERY_REQUIRED' if mutated else 'CANCELLED',
|
||||
'已停止后续导入;已发生的原生变更需要核对', owner_safe)
|
||||
if not removed:
|
||||
native_stack.enter_context(native_channel())
|
||||
checkpoint('native_add')
|
||||
mutated = True; owner_safe = False
|
||||
native = invoke(adapter.add, staged, root/'add')
|
||||
@@ -413,42 +377,27 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
owner_safe = after.safe_to_continue
|
||||
matches = [entry for entry in after.entries if entry.name == request.name
|
||||
and entry.partition == request.partition]
|
||||
expected_proof, registered_proof = identity, native.identity_proof
|
||||
if isinstance(identity, dict) and identity.get('policy') == 'mentor795-import-assets-v1':
|
||||
expected_proof = {key: value for key, value in identity.items() if key != 'assets'}
|
||||
registered_proof = ({key: value for key, value in registered_proof.items() if key != 'assets'}
|
||||
if isinstance(registered_proof, dict) else None)
|
||||
# Library Manager may name the imported top block after the CBB.
|
||||
if registered_proof is not None and registered_proof.get('top_level_block') == request.name:
|
||||
expected_proof['top_level_block'] = request.name
|
||||
proof_matches = (native.identity_matches is True and registered_proof == expected_proof
|
||||
proof_matches = (native.identity_matches is True and native.identity_proof == identity
|
||||
if hasattr(adapter, 'prepare_add_transaction') else
|
||||
len(matches) == 1 and matches[0].engineering_identity == identity)
|
||||
if (not owner_safe or Path(after.library).resolve() != canonical_library or after.flow != 1
|
||||
or len(matches) != 1 or not proof_matches):
|
||||
return finish('RECOVERY_REQUIRED', '原生新增后名称、分区或工程关联未确认一致。\n'+native.detail, owner_safe)
|
||||
return finish('RECOVERY_REQUIRED', '原生新增后名称、分区或来源工程内容未确认一致。', owner_safe)
|
||||
uploaded = True
|
||||
checkpoint('uploaded')
|
||||
native_stack.close()
|
||||
if not request.auto_verify:
|
||||
return finish('UPLOADED', '上传已确认;本批次未启用自动校验。\n'+native.detail)
|
||||
return finish('UPLOADED', '上传已确认;本批次未启用自动校验。')
|
||||
# Adapter catalog cannot return until its exact native owner exits.
|
||||
checkpoint('verify')
|
||||
owner_safe = False
|
||||
options = {'version_prompt': version_prompt} if version_prompt is not None else {}
|
||||
verified = verifier(VerifyRequest(library, request.name, root/'verify',
|
||||
mapped_drive=request.mapped_drive, mapped_remote_root=request.mapped_remote_root),
|
||||
progress=progress, stop=stop, **options)
|
||||
mapped_drive=request.mapped_drive, mapped_remote_root=request.mapped_remote_root), progress=progress)
|
||||
owner_safe = verified.safe_to_continue
|
||||
checkpoint('verified', verification=asdict(verified))
|
||||
good = verified.status == 'PASS' and verified.library_flag == 'GREEN' and owner_safe
|
||||
return finish('UPLOADED_VERIFIED' if good else 'UPLOADED_VERIFY_FAILED',
|
||||
'\n'.join(filter(None, (native.detail, verified.stderr or verified.library_flag_detail))), owner_safe)
|
||||
verified.stderr or verified.library_flag_detail, owner_safe)
|
||||
except Exception as error:
|
||||
from .write_admission import WriteAdmissionDeclined
|
||||
if isinstance(error,WriteAdmissionDeclined):
|
||||
return finish('RECOVERY_REQUIRED' if mutated else
|
||||
'CANCELLED' if error.decision=='cancel' else 'SKIPPED',str(error),owner_safe)
|
||||
if uploaded:
|
||||
return finish('UPLOADED_VERIFY_FAILED', str(error), owner_safe)
|
||||
status = 'RECOVERY_REQUIRED' if mutated else ('UPLOAD_FAILED' if request.operation in ('add', 'update') else 'BLOCKED')
|
||||
@@ -459,63 +408,23 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
|
||||
status = 'BLOCKED'
|
||||
return finish(status, str(error), owner_safe)
|
||||
finally:
|
||||
if mutex is not None:
|
||||
if acquired:
|
||||
win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
uninitialize_com(initialized)
|
||||
|
||||
|
||||
def run_management_batch(requests, *, stop=None, progress=None, item_executor=None, context=None, **kwargs):
|
||||
from threading import Event
|
||||
from .write_admission import WriteAdmission
|
||||
from .operation_queue import QueueCancelled, TaskHandoff, request_library_keys, remember_result, current_context
|
||||
context = context or current_context()
|
||||
if context is not None:
|
||||
stop = stop if stop is not None else context.stop
|
||||
progress = context.guard_callback(progress) if progress else None
|
||||
if stop is None:
|
||||
stop = Event()
|
||||
kwargs.setdefault('write_admission',WriteAdmission(prompt=kwargs.get('version_prompt'),stop=stop))
|
||||
def run_management_batch(requests, *, stop=None, progress=None, **kwargs):
|
||||
results = []
|
||||
retained_libraries = set()
|
||||
cancelled = False
|
||||
for request in requests:
|
||||
keys = request_library_keys(request, context)
|
||||
stopped = (cancelled or stop.is_set() or context is not None
|
||||
and (context.stop.is_set() or context.stop_after_current.is_set()))
|
||||
if stopped or keys.intersection(retained_libraries):
|
||||
result = ManagementResult(request.operation, request.library, request.name, request.partition,
|
||||
request.source, request.auto_verify, 'complete', 'SKIPPED', True,
|
||||
'队列已停止,未操作此 CBB' if stopped else '同库原生会话尚未释放,未启动新的写入')
|
||||
results.append(result)
|
||||
if progress:
|
||||
progress({'stage': result.status, 'block': result.name, 'detail': result.detail})
|
||||
continue
|
||||
def action():
|
||||
result = run_management(request, progress=progress, stop=stop, **kwargs)
|
||||
remember_result(result)
|
||||
if not result.safe_to_continue:
|
||||
from .operation_lifecycle import recheck_failed_release
|
||||
result = recheck_failed_release(request.library, request.name, result, stop=stop)
|
||||
return result
|
||||
try:
|
||||
result = item_executor(request, action) if item_executor is not None else action()
|
||||
except QueueCancelled as error:
|
||||
known = error.result if isinstance(error, TaskHandoff) else None
|
||||
if isinstance(known, ManagementResult):
|
||||
result = replace(known, safe_to_continue=False,
|
||||
status='RECOVERY_REQUIRED' if known.status in ('PASS', 'UPLOADED', 'UPLOADED_VERIFIED', 'REMOVED')
|
||||
else known.status,
|
||||
release_proof=dict(status='RELEASE_PENDING', lease_state='PENDING',
|
||||
resource_scope=error.scope, previous_release_proof=known.release_proof))
|
||||
else:
|
||||
result = ManagementResult(request.operation, request.library, request.name, request.partition,
|
||||
request.source, request.auto_verify, 'complete',
|
||||
'TIMEOUT' if isinstance(error, TaskHandoff) and not error.cancelled else 'CANCELLED',
|
||||
not isinstance(error, TaskHandoff), str(error))
|
||||
if stop is not None and stop.is_set():
|
||||
break
|
||||
result = run_management(request, progress=progress, **kwargs)
|
||||
results.append(result)
|
||||
if progress:
|
||||
progress({'stage': result.status, 'block': result.name, 'detail': result.detail,
|
||||
'evidence_path': str(result.evidence_path or '')})
|
||||
if not result.safe_to_continue:
|
||||
retained_libraries.update(keys)
|
||||
if result.status == 'CANCELLED':
|
||||
cancelled = True
|
||||
break
|
||||
return results
|
||||
@@ -25,9 +25,9 @@ def fixture_authority(root, library, token):
|
||||
|
||||
|
||||
def current_lease(library):
|
||||
from .library_lock import LibraryLock, _library_guard, _owners, blocker_path, checkpoint_record
|
||||
from .library_lock import LibraryLock, _guard, _owners, blocker_path, checkpoint_record
|
||||
lease = LibraryLock(library)
|
||||
with _library_guard(lease.key):
|
||||
with _guard:
|
||||
owner = _owners.get(lease.key)
|
||||
guard = checkpoint_record(blocker_path(library))
|
||||
if (owner is None or owner['retained'] or owner['thread'] != threading.get_ident()
|
||||
|
||||
@@ -68,10 +68,6 @@ def pcb_startup_timeout_seconds(timeout_seconds):
|
||||
return max(60.0, float(timeout_seconds))
|
||||
|
||||
|
||||
def lm_dispatch_timeout_seconds(timeout_seconds):
|
||||
return max(.1, min(45.0, float(timeout_seconds)))
|
||||
|
||||
|
||||
def same_path(first, second):
|
||||
return os.path.normcase(os.path.abspath(str(first))) == os.path.normcase(os.path.abspath(str(second)))
|
||||
|
||||
@@ -684,11 +680,6 @@ def execute_job(job, emit):
|
||||
launcher_process = None
|
||||
completed = False
|
||||
identity_verified = False
|
||||
write_admitted = False
|
||||
prewrite_eligible = (job.get('diagnostic_only') is False and not job.get('native_lm_verify')
|
||||
and not job.get('post_repair_consent') and not job.get('interactive_input')
|
||||
and all(job.get(k) for k in ('operation_id','session_record_path','desktop')))
|
||||
startup_binding={k:job.get(k) for k in ('operation_id','project','pcb','desktop')}
|
||||
diagnostic_close_attempted = False
|
||||
helper = None
|
||||
app = doc = pi = None
|
||||
@@ -707,15 +698,12 @@ def execute_job(job, emit):
|
||||
from .diagnostic_open import snapshot_diagnostic_logs
|
||||
job['diagnostic_log_baseline'] = snapshot_diagnostic_logs(job)
|
||||
else:
|
||||
from .maintenance_entry import maintenance_project_files
|
||||
for index, config in enumerate(maintenance_project_files(job['project'], job['pcb'])):
|
||||
ensure_project_central_library(config, job['lmc_file'],
|
||||
evidence_dir=Path(root)/'diagnostics'/f'project-{index}', emit=emit)
|
||||
if prewrite_eligible:
|
||||
from .diagnostic_open import snapshot_diagnostic_logs
|
||||
from .session_record import process_identity
|
||||
emit(stage='startup_prewrite_ready',baseline=snapshot_diagnostic_logs(job),
|
||||
worker_identity=process_identity(os.getpid()),**startup_binding)
|
||||
ensure_pcb_central_library(
|
||||
job['pcb'],
|
||||
job['lmc_file'],
|
||||
evidence_dir=Path(root) / 'diagnostics',
|
||||
emit=emit,
|
||||
)
|
||||
emit(
|
||||
stage='verify_mode',
|
||||
mode=('library_manager_native' if bool(job.get('native_lm_verify', False))
|
||||
@@ -728,13 +716,12 @@ def execute_job(job, emit):
|
||||
pcb_started_ns = time.time_ns()
|
||||
if bool(job.get('native_lm_verify', False)):
|
||||
from .library_manager_verify import launch_library_verify
|
||||
dispatch_deadline = time.monotonic()+lm_dispatch_timeout_seconds(job['timeout'])
|
||||
emit(stage='lm_launch', library=job['lmc_file'], block=job['block_name'])
|
||||
lm_session = launch_library_verify(
|
||||
job['lmc_file'],
|
||||
job['block_name'],
|
||||
emit,
|
||||
dispatch_deadline,
|
||||
time.monotonic() + pcb_startup_timeout_seconds(job['timeout']),
|
||||
mentor_bin=job.get('mentor_bin'),
|
||||
interactive_input=bool(job.get('interactive_input', False)),
|
||||
)
|
||||
@@ -750,8 +737,8 @@ def execute_job(job, emit):
|
||||
worker_parent_pid = int(launcher_process.pid)
|
||||
emit(stage='pcb_launcher_started', launcher_pid=worker_parent_pid,
|
||||
command=list(command), strategy='reusable_circuit_direct')
|
||||
pcb_deadline = (dispatch_deadline if job.get('native_lm_verify') else
|
||||
time.monotonic()+pcb_startup_timeout_seconds(job['timeout']))
|
||||
pcb_deadline = reset_verify_activity_deadline(
|
||||
0.0, time.monotonic(), timeout_seconds=pcb_startup_timeout_seconds(job['timeout']))
|
||||
while time.monotonic() < pcb_deadline:
|
||||
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
|
||||
raise RuntimeError('VERIFY_CANCELLED: PCB 启动期间收到停止请求')
|
||||
@@ -784,8 +771,6 @@ def execute_job(job, emit):
|
||||
break
|
||||
time.sleep(.2)
|
||||
if worker_pid is None:
|
||||
if job.get('native_lm_verify'):
|
||||
raise RuntimeError('VERIFY_DISPATCH_FAILED: LM 菜单返回但未观察到目标 PCB,未执行校验')
|
||||
raise RuntimeError('ReusableCircuit common 启动后未观察到 wg PCB 子进程')
|
||||
if job.get('diagnostic_only'):
|
||||
# Global PCB COM can wait on another design's modal window.
|
||||
@@ -820,10 +805,6 @@ def execute_job(job, emit):
|
||||
# the old, working path acquires the token inside the SysWOW64
|
||||
# cscript save helper below. The PCB UI license dialog has already
|
||||
# been handled by the private-desktop supervisor.
|
||||
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
|
||||
raise RuntimeError('VERIFY_CANCELLED: 未开始工程集成')
|
||||
write_admitted = True
|
||||
if prewrite_eligible:emit(stage='startup_write_admitted',**startup_binding)
|
||||
refresh_integration(
|
||||
pi,
|
||||
emit=emit,
|
||||
@@ -840,16 +821,15 @@ def execute_job(job, emit):
|
||||
script = Path(__file__).with_name('save_verified_block.vbs')
|
||||
cscript = Path(os.environ.get('WINDIR', r'C:\Windows'))/'SysWOW64'/'cscript.exe'
|
||||
from .desktop_worker import launch_save_helper
|
||||
helper_gate = root/'start-save.signal'
|
||||
with (root/'save.log').open('w', encoding='utf-8') as log:
|
||||
helper = launch_save_helper([str(cscript), '//nologo', str(script), job['project'],
|
||||
Path(job['pcb']).name, str(job.get('cancel_signal') or ''), str(helper_gate)],
|
||||
start_gate=helper_gate, identity_path=root/'worker-state.json',
|
||||
operation_id=job.get('operation_id', root.name),
|
||||
Path(job['pcb']).name, str(job.get('cancel_signal') or '')],
|
||||
stdout=log, stderr=log, creationflags=getattr(subprocess, 'CREATE_NO_WINDOW', 0))
|
||||
emit(stage='save_helper', helper_pid=helper.pid)
|
||||
last_markers = ()
|
||||
while helper.poll() is None:
|
||||
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
|
||||
raise RuntimeError('VERIFY_CANCELLED: 已停止等待保存客户端')
|
||||
try:
|
||||
current = tuple(line.strip() for line in (root/'save.log').read_text(encoding='utf-8', errors='replace').splitlines() if line.strip())
|
||||
except OSError:
|
||||
@@ -857,18 +837,14 @@ def execute_job(job, emit):
|
||||
if current != last_markers:
|
||||
last_markers = current
|
||||
from .runtime_timing import parse_save_progress
|
||||
emit(stage='save_progress', helper_exited=False, **parse_save_progress('\n'.join(current)))
|
||||
emit(stage='save_progress', **parse_save_progress('\n'.join(current)))
|
||||
time.sleep(.2)
|
||||
code = helper.returncode
|
||||
save_log = (root/'save.log').read_bytes().decode('utf-8', errors='replace')
|
||||
from .runtime_timing import parse_save_progress
|
||||
emit(stage='save_progress', helper_exited=True, **parse_save_progress(save_log))
|
||||
emit(stage='save_progress', **parse_save_progress(save_log))
|
||||
markers = set(save_log.splitlines())
|
||||
from .operation_lifecycle import classify_save_state
|
||||
write_facts = classify_save_state(save_log.splitlines(), helper_exited=True, native_released=None)
|
||||
if ((code not in (None, 0)) or not save_log_has_core_markers(save_log)
|
||||
or write_facts['save_state'] != 'COMMITTED' or write_facts['close_state'] != 'CLOSED'
|
||||
or write_facts['interrupted']):
|
||||
if (code not in (None, 0)) or not save_log_has_core_markers(save_log):
|
||||
raise RuntimeError(f'保存/关闭未完成 ({code}): {save_log}')
|
||||
if 'QUIT_OK' not in markers:
|
||||
emit(stage='save_quit_recovered', detail='Save/Close 已确认,忽略卡住的 app.Quit。')
|
||||
@@ -911,9 +887,6 @@ def execute_job(job, emit):
|
||||
pass
|
||||
if helper is not None and helper.poll() is None:
|
||||
emit(stage='save_helper_retained', helper_pid=helper.pid)
|
||||
elif helper is not None:
|
||||
# A failed/truncated Save result never authorizes discard-close.
|
||||
emit(stage='save_result_retained', detail='保存或关闭结果不完整,保留原生会话供核对')
|
||||
elif diagnostic_close_attempted:
|
||||
# The process-bound checker already sent its sole WM_CLOSE.
|
||||
# Preserve an unknown prompt; never fall back to global COM Close.
|
||||
@@ -929,10 +902,6 @@ def execute_job(job, emit):
|
||||
elif not completed and worker_pid is not None:
|
||||
try:
|
||||
from .failed_session import close_failed_startup
|
||||
if (prewrite_eligible and not write_admitted and not identity_verified
|
||||
and job.get('cancel_signal') and Path(job['cancel_signal']).exists()):
|
||||
emit(stage='startup_cancelled_prewrite',pcb_pid=worker_pid,
|
||||
identity_verified=False,write_admitted=False,**startup_binding)
|
||||
failed_close = close_failed_startup(job, worker_pid, baseline_pids=pcb_before, emit=emit,
|
||||
launcher_process=launcher_process)
|
||||
if failed_close.get('status') == 'CLOSED' and lm_session is not None:
|
||||
@@ -949,8 +918,19 @@ def execute_job(job, emit):
|
||||
)
|
||||
if completed and lm_session is not None:
|
||||
lm_session.close()
|
||||
elif worker_pid is None and lm_session is not None:
|
||||
lm_session.close() # No PCB was dispatched; close only this owned LM.
|
||||
|
||||
|
||||
def _terminate_pid(pid, *, timeout=20):
|
||||
"""Terminate a validated automation helper PID, never its native children."""
|
||||
try:
|
||||
subprocess.run(
|
||||
[str(Path(os.environ.get('WINDIR', r'C:\Windows'))/'System32'/'taskkill.exe'), '/PID', str(int(pid)), '/F'],
|
||||
capture_output=True,
|
||||
timeout=timeout,
|
||||
creationflags=getattr(subprocess, 'CREATE_NO_WINDOW', 0),
|
||||
)
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def cleanup_verify_processes(lm_pid, worker_pid, worker_parent_pid=None, *,
|
||||
@@ -1014,22 +994,6 @@ def worker_main(request_path):
|
||||
root = Path(job['root'])
|
||||
|
||||
def emit(**event):
|
||||
from .session_record import update_worker_state
|
||||
phase = {'save_start': 'NATIVE_CALL', 'integration_action': 'NATIVE_CALL',
|
||||
'integration_action_complete': 'POSTCALL', 'saved_and_closed': 'RELEASE_CHECK',
|
||||
'complete': 'FINISHED', 'failed': 'UNCONFIRMED'}.get(event.get('stage'))
|
||||
identities = [(role, event.get(key)) for role, key in
|
||||
(('native', 'pcb_pid'), ('native', 'lm_pid'), ('helper', 'helper_pid'))
|
||||
if event.get(key)]
|
||||
facts = None
|
||||
if event.get('stage') == 'save_progress':
|
||||
from .operation_lifecycle import classify_save_state
|
||||
facts = classify_save_state(event.get('markers', ()),
|
||||
helper_exited=event.get('helper_exited'), native_released=None)
|
||||
phase = ('POSTCALL' if event.get('helper_exited') is True else
|
||||
'CLOSING' if 'CLOSE_START' in event.get('markers', ()) else 'NATIVE_CALL')
|
||||
if phase or identities:
|
||||
update_worker_state(job, phase or 'UNCONFIRMED', identities=identities, write_outcome=facts)
|
||||
event.update(time=time.strftime('%Y-%m-%d %H:%M:%S'), block=job['block_name'],
|
||||
monotonic_seconds=time.monotonic())
|
||||
with (root/'events.jsonl').open('a', encoding='utf-8') as stream:
|
||||
@@ -1037,12 +1001,8 @@ def worker_main(request_path):
|
||||
|
||||
try:
|
||||
if job.get('supervisor_pid'):
|
||||
from .session_record import update_worker_state
|
||||
update_worker_state(job, 'PRECALL')
|
||||
from .desktop_worker import start_supervisor_watchdog
|
||||
start_supervisor_watchdog(job['supervisor_pid'], cancel_path=job.get('cancel_signal'), stop_clients=True,
|
||||
supervisor_identity=job.get('supervisor_identity'),
|
||||
session_record_path=job.get('session_record_path'), operation_id=job.get('operation_id'))
|
||||
start_supervisor_watchdog(job['supervisor_pid'], cancel_path=job.get('cancel_signal'), stop_clients=True)
|
||||
start_gate = Path(job.get('start_gate', '')) if job.get('start_gate') else None
|
||||
if start_gate is not None:
|
||||
from .defaults import WORKER_START_GATE_TIMEOUT_SECONDS
|
||||
@@ -1490,58 +1450,173 @@ def close_library_reader(pid, desktop, *, timeout_seconds=5):
|
||||
return False
|
||||
|
||||
|
||||
def _existing_library_tree_images(library, names, *, timeout_seconds):
|
||||
"""Observe a matching, enabled LM; never launch, select, answer or close it."""
|
||||
def read_library_flag(library, name, *, timeout_seconds=90, log_path=None):
|
||||
"""Return (flag, detail) for one CBB by reading its tree icon.
|
||||
|
||||
Read-only: Library Manager is started on a private desktop, the tree is
|
||||
walked with messages, the icon index is read, and the process is killed.
|
||||
The cursor is never moved and no menu is opened.
|
||||
"""
|
||||
import win32con
|
||||
import win32process
|
||||
import win32service
|
||||
from pywinauto import Desktop
|
||||
from pywinauto.controls.common_controls import TreeViewWrapper
|
||||
library = Path(library)
|
||||
result = {name: None for name in names}
|
||||
|
||||
executable = library_manager_path()
|
||||
if not executable.is_file():
|
||||
return FLAG_UNKNOWN, f'找不到 Library Manager: {executable}'
|
||||
|
||||
deadline = time.monotonic() + timeout_seconds
|
||||
desktop_name = 'CbbFlagRead_' + os.urandom(5).hex()
|
||||
desktop = None
|
||||
|
||||
handle = None
|
||||
pid = None
|
||||
handled = set()
|
||||
log = log_path or Path(library).parent/'LogFiles'/'cbb_flag_read_dialogs.jsonl'
|
||||
try:
|
||||
matches = [window for window in Desktop(backend='win32').windows()
|
||||
if window.window_text().startswith('Library Manager:')
|
||||
and same_path(window.window_text().split(':', 1)[1].strip(), library)]
|
||||
if len(matches) != 1:
|
||||
return result, '未找到唯一匹配库的已打开 Library Manager,状态无法确认'
|
||||
target = matches[0]
|
||||
if not target.is_enabled():
|
||||
return result, 'Library Manager 有原生提示或正在操作,状态无法确认'
|
||||
trees = [window for window in target.descendants() if 'TreeView' in window.class_name()]
|
||||
if len(trees) != 1:
|
||||
return result, '导航树不唯一,状态无法确认'
|
||||
tree = TreeViewWrapper(trees[0].handle)
|
||||
deadline = time.monotonic() + timeout_seconds
|
||||
for name in names:
|
||||
if time.monotonic() >= deadline or not target.is_enabled():
|
||||
desktop = win32service.CreateDesktop(desktop_name, 0, win32con.GENERIC_ALL, None)
|
||||
startup = win32process.STARTUPINFO()
|
||||
startup.lpDesktop = 'winsta0\\' + desktop_name
|
||||
handle, thread, pid, _ = win32process.CreateProcess(
|
||||
str(executable), subprocess.list2cmdline([str(executable), str(library)]),
|
||||
None, None, False, win32con.CREATE_NO_WINDOW, None, None, startup)
|
||||
thread.Close()
|
||||
target = None
|
||||
while time.monotonic() < deadline:
|
||||
target = _private_library_window(desktop, library)
|
||||
if target is not None:
|
||||
break
|
||||
handle_known_dialogs(pid, handled, log, desktop=desktop)
|
||||
time.sleep(.3)
|
||||
if target is None:
|
||||
return FLAG_UNKNOWN, 'Library Manager 窗口未就绪(状态未读取)'
|
||||
|
||||
trees = [w for w in target.descendants() if 'TreeView' in w.class_name()]
|
||||
if len(trees) != 1:
|
||||
return FLAG_UNKNOWN, '导航树不唯一(状态未读取)'
|
||||
tree = TreeViewWrapper(trees[0].handle)
|
||||
item = tree.get_item(['Central Libraries', Path(library).name, 'Reusable Blocks', 'Logical-Physical', name], exact=True)
|
||||
item.ensure_visible()
|
||||
index = _tree_image(item, tree)
|
||||
from .library_reader import filesystem_evidence_map, infer_tree_statuses, reconcile_statuses
|
||||
evidence = filesystem_evidence_map(library, (name,))
|
||||
filesystem = {name: evidence[name]['status']}
|
||||
calibrated = infer_tree_statuses({name: index}, filesystem, (name,))
|
||||
status = reconcile_statuses(calibrated, filesystem, (name,))[name]
|
||||
flag = FLAG_GREEN if status == 'READY' else FLAG_NOT_GREEN if status == 'PENDING' else FLAG_UNKNOWN
|
||||
detail = f'图标索引 {index};持久化证据={evidence.get(name, {})};校准状态={status}'
|
||||
if flag == FLAG_UNKNOWN:
|
||||
detail += ';未取得足够的持久化证据与图标 ID 对应关系,未强行判定'
|
||||
return flag, detail
|
||||
except Exception as error:
|
||||
return FLAG_UNKNOWN, f'状态读取失败: {error}'
|
||||
finally:
|
||||
released = pid is None or close_library_reader(pid, desktop)
|
||||
if handle is not None:
|
||||
try:
|
||||
item = tree.get_item(['Central Libraries', library.name, 'Reusable Blocks',
|
||||
'Logical-Physical', name], exact=True)
|
||||
result[name] = _tree_image(item, tree)
|
||||
handle.Close()
|
||||
except Exception:
|
||||
pass
|
||||
return result, '已观察匹配库的导航树图标;图标本身不是权威状态码'
|
||||
except Exception as error:
|
||||
return result, f'状态读取失败: {error}'
|
||||
try:
|
||||
if desktop is not None:
|
||||
desktop.CloseDesktop()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
|
||||
def read_library_flag(library, name, *, timeout_seconds=90, log_path=None):
|
||||
library = Path(library)
|
||||
images, detail = _existing_library_tree_images(library, (name,), timeout_seconds=timeout_seconds)
|
||||
if images[name] is None:
|
||||
return FLAG_UNKNOWN, detail
|
||||
from .library_reader import filesystem_evidence_map, infer_tree_statuses, reconcile_statuses
|
||||
evidence = filesystem_evidence_map(library, (name,))
|
||||
filesystem = {name: evidence[name]['status']}
|
||||
calibrated = infer_tree_statuses(images, filesystem, (name,))
|
||||
status = reconcile_statuses(calibrated, filesystem, (name,))[name]
|
||||
flag = FLAG_GREEN if status == 'READY' else FLAG_NOT_GREEN if status == 'PENDING' else FLAG_UNKNOWN
|
||||
return flag, f'{detail};图标索引 {images[name]};校准状态={status}'
|
||||
if not released:
|
||||
raise RuntimeError(f'LIBRARY_RELEASE_UNCONFIRMED: pid={pid}; desktop={desktop_name}')
|
||||
|
||||
|
||||
def read_library_tree_image_map(library, names, *, timeout_seconds=45, log_path=None):
|
||||
library = Path(library)
|
||||
images, _ = _existing_library_tree_images(library, tuple(names), timeout_seconds=timeout_seconds)
|
||||
return images
|
||||
"""Read all CBB tree icon resource IDs in one private LM session.
|
||||
|
||||
This is deliberately read-only. It avoids the previous one-process-per-
|
||||
CBB implementation, while keeping the LM window off the user's desktop.
|
||||
The returned integer is only an observation. It is logged with each CBB
|
||||
and calibrated against independent persisted Cert evidence because Mentor
|
||||
resource IDs vary by installation. Context-menu labels are not used.
|
||||
"""
|
||||
import win32con
|
||||
import win32process
|
||||
import win32service
|
||||
from pywinauto import Desktop
|
||||
from pywinauto.controls.common_controls import TreeViewWrapper
|
||||
|
||||
names = tuple(names)
|
||||
result = {name: None for name in names}
|
||||
executable = library_manager_path()
|
||||
if not executable.is_file():
|
||||
return result
|
||||
desktop_name = 'CbbStatusRead_' + os.urandom(5).hex()
|
||||
desktop = None
|
||||
handle = None
|
||||
pid = None
|
||||
handled = set()
|
||||
log = log_path or Path(library).parent/'LogFiles'/'cbb_status_read_dialogs.jsonl'
|
||||
try:
|
||||
desktop = win32service.CreateDesktop(desktop_name, 0, win32con.GENERIC_ALL, None)
|
||||
startup = win32process.STARTUPINFO()
|
||||
startup.lpDesktop = 'winsta0\\' + desktop_name
|
||||
handle, thread, pid, _ = win32process.CreateProcess(
|
||||
str(executable), subprocess.list2cmdline([str(executable), str(library)]),
|
||||
None, None, False, win32con.CREATE_NO_WINDOW, None, None, startup)
|
||||
handle.Close(); handle = None
|
||||
thread.Close()
|
||||
deadline = time.monotonic() + timeout_seconds
|
||||
target = None
|
||||
while time.monotonic() < deadline:
|
||||
target = _private_library_window(desktop, library)
|
||||
if target is not None:
|
||||
break
|
||||
handle_known_dialogs(pid, handled, log, desktop=desktop)
|
||||
time.sleep(.25)
|
||||
if target is None:
|
||||
return result
|
||||
trees = [w for w in target.descendants() if 'TreeView' in w.class_name()]
|
||||
if len(trees) != 1:
|
||||
return result
|
||||
tree = TreeViewWrapper(trees[0].handle)
|
||||
root_name = Path(library).name
|
||||
details = {}
|
||||
for name in names:
|
||||
if time.monotonic() >= deadline:
|
||||
logger.warning('library_tree_image_probe_timeout path=%s processed=%s total=%s',
|
||||
library, len(details), len(names))
|
||||
break
|
||||
try:
|
||||
item = tree.get_item(['Central Libraries', root_name, 'Reusable Blocks', 'Logical-Physical', name], exact=True)
|
||||
details[name] = _tree_image_details(item, tree)
|
||||
result[name] = details[name]['image_id']
|
||||
except Exception:
|
||||
result[name] = None
|
||||
logger.info('library_tree_images path=%s names=%s histogram=%s', library, len(names),
|
||||
dict(Counter(str(value) for value in result.values() if value is not None)))
|
||||
for name in names:
|
||||
if name in details:
|
||||
logger.info('library_tree_image_item name=%s image_id=%s selected_image_id=%s state_image_id=%s image_color=%s selected_image_color=%s state_image_color=%s',
|
||||
name, details[name]['image_id'], details[name]['selected_image_id'],
|
||||
details[name]['state_image_id'], details[name]['image_color'],
|
||||
details[name]['selected_image_color'], details[name]['state_image_color'])
|
||||
else:
|
||||
logger.warning('library_tree_image_item_missing name=%s reason=tree_path_lookup_failed', name)
|
||||
return result
|
||||
finally:
|
||||
released = pid is None or close_library_reader(pid, desktop)
|
||||
if handle is not None:
|
||||
try:
|
||||
handle.Close()
|
||||
except Exception:
|
||||
pass
|
||||
try:
|
||||
if desktop is not None:
|
||||
desktop.CloseDesktop()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
if not released:
|
||||
raise RuntimeError(f'LIBRARY_RELEASE_UNCONFIRMED: pid={pid}; desktop={desktop_name}')
|
||||
|
||||
|
||||
def read_library_status_map(library, names, *, timeout_seconds=45, log_path=None,
|
||||
|
||||
@@ -7,15 +7,8 @@ class CbbRecord:
|
||||
partition_name: str
|
||||
logical_type: str = "LP"
|
||||
status: str = "UNKNOWN"
|
||||
catalog_source: str = "provided"
|
||||
status_source: str = "provided"
|
||||
missing_reason: str = ""
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class LibraryReadResult:
|
||||
records: tuple[CbbRecord, ...]
|
||||
error: str | None = None
|
||||
directory_count: int | None = None
|
||||
native_count: int | None = None
|
||||
missing_project_count: int | None = None
|
||||
catalog_verified: bool = False
|
||||
@@ -1,11 +1,7 @@
|
||||
"""Open the official backup UI; version selection and writes stay native."""
|
||||
from dataclasses import dataclass
|
||||
import json
|
||||
import hashlib
|
||||
import os
|
||||
from pathlib import Path
|
||||
from pathlib import PureWindowsPath
|
||||
import re
|
||||
import stat
|
||||
import subprocess
|
||||
import sys
|
||||
@@ -43,36 +39,6 @@ def native_backup_project(library, block):
|
||||
return project
|
||||
|
||||
|
||||
def native_backup_target(request, *, mode='versions', target_database=None):
|
||||
"""Bind the official tool without requiring an openable/healthy PCB."""
|
||||
from .backup_recovery import _project_text
|
||||
from .maintenance_entry import maintenance_project_files
|
||||
if mode not in ('versions', 'repair'):
|
||||
raise ValueError('NATIVE_TARGET_MODE_INVALID')
|
||||
project = native_backup_project(request.lmc_file, request.block_name)
|
||||
candidates = (project,)
|
||||
if target_database is not None:
|
||||
pcbs = list((project.parent/'PCB').glob('*.pcb'))
|
||||
if len(pcbs) != 1:
|
||||
raise ValueError('NATIVE_TARGET_UNCONFIRMED: 无法唯一绑定 PCB 工程')
|
||||
candidates = maintenance_project_files(project, pcbs[0])
|
||||
matches = []
|
||||
for config in candidates:
|
||||
values = re.findall(r'^KEY iCDBDir "([^"\r\n]+)"\s*$', _project_text(config), re.M)
|
||||
if len(values) != 1 or not values[0] or PureWindowsPath(values[0]).root or PureWindowsPath(values[0]).drive:
|
||||
if config == project or target_database is None:
|
||||
raise ValueError('NATIVE_TARGET_UNCONFIRMED: 主 PRJ 的 iCDBDir 必须唯一且为工程内相对路径,不支持绝对路径或多条记录')
|
||||
continue
|
||||
database = (config.parent/values[0]).resolve()
|
||||
if not database.is_relative_to(project.parent.resolve()):
|
||||
raise ValueError('NATIVE_TARGET_UNCONFIRMED: 数据库不在当前工程内')
|
||||
if target_database is None or database == Path(target_database).resolve():
|
||||
matches.append((config, database))
|
||||
if len(matches) != 1:
|
||||
raise ValueError('NATIVE_TARGET_UNCONFIRMED: 诊断数据库未绑定唯一工程 PRJ')
|
||||
return matches[0]
|
||||
|
||||
|
||||
@dataclass
|
||||
class NativeBackupSession:
|
||||
process: object
|
||||
@@ -80,18 +46,10 @@ class NativeBackupSession:
|
||||
library: Path
|
||||
block: str
|
||||
path_lease: object = None
|
||||
mode: str = 'versions'
|
||||
project: Path | None = None
|
||||
database: Path | None = None
|
||||
session_record_path: Path | None = None
|
||||
operation_id: str | None = None
|
||||
|
||||
|
||||
def launch_native_backup(request, *, mode='versions', target_database=None):
|
||||
from .library_lock import recheck_previous_release
|
||||
from .session_record import register_worker_session
|
||||
from .operation_queue import check_active, native_channel, task_stop, commit_worker_start
|
||||
project, database = native_backup_target(request, mode=mode, target_database=target_database)
|
||||
def launch_native_backup(request):
|
||||
project = native_backup_project(request.lmc_file, request.block_name)
|
||||
native_backup_executable(request.mentor_bin)
|
||||
root = Path(request.evidence_dir).resolve()/('native-backup-'+uuid4().hex[:12])
|
||||
library_root = Path(request.lmc_file).resolve().parent
|
||||
@@ -99,55 +57,17 @@ def launch_native_backup(request, *, mode='versions', target_database=None):
|
||||
raise ValueError('运行记录目录需位于中心库之外。')
|
||||
root.mkdir(parents=True)
|
||||
job = root/'request.json'
|
||||
recheck_previous_release(request.lmc_file, root/'previous-release',
|
||||
block_name=request.block_name, stop=task_stop(None))
|
||||
record = {'library': str(request.lmc_file), 'block': request.block_name,
|
||||
'project': str(project), 'database': str(database), 'mode': mode,
|
||||
'project_sha256': hashlib.sha256(project.read_bytes()).hexdigest(),
|
||||
'target_database': str(target_database) if target_database is not None else None,
|
||||
'mentor_bin': request.mentor_bin, 'automatic_repair': False,
|
||||
'operation': 'native_backup', 'operation_id': root.name,
|
||||
'session_record_path': str(root/'session.json'), 'start_gate': str(root/'start-worker.signal'),
|
||||
'start_gate_protocol': 'event-v1',
|
||||
'cancel_signal': str(root/'cancel-worker.signal'), 'supervisor_pid': os.getpid(), 'desktop': None}
|
||||
job.write_text(json.dumps(record, ensure_ascii=False), 'utf-8')
|
||||
job.write_text(json.dumps({'library': str(request.lmc_file), 'block': request.block_name,
|
||||
'project': str(project), 'mentor_bin': request.mentor_bin}, ensure_ascii=False), 'utf-8')
|
||||
command = ([sys.executable] if getattr(sys, 'frozen', False) else
|
||||
[sys.executable, '-m', 'cbb_refresh_verify'])+['--native-backup-worker', str(job)]
|
||||
try:
|
||||
check_active()
|
||||
process = subprocess.Popen(command, creationflags=getattr(subprocess, 'CREATE_NO_WINDOW', 0))
|
||||
register_worker_session(process, record)
|
||||
with native_channel():
|
||||
check_active()
|
||||
commit_worker_start(process, record)
|
||||
except BaseException:
|
||||
Path(record['cancel_signal']).touch() # The unadmitted child exits without native launch.
|
||||
raise
|
||||
return NativeBackupSession(process, job, Path(request.lmc_file), request.block_name,
|
||||
mode=mode, project=project, database=database, session_record_path=Path(record['session_record_path']),
|
||||
operation_id=record['operation_id'])
|
||||
|
||||
|
||||
class _BackupJobWriter:
|
||||
"""Independent Job handle keeps future descendants inside the writer boundary."""
|
||||
def __init__(self, job):
|
||||
import win32api, win32con
|
||||
current = win32api.GetCurrentProcess()
|
||||
self.job = win32api.DuplicateHandle(current, job, current, 0, False, win32con.DUPLICATE_SAME_ACCESS)
|
||||
|
||||
def poll(self):
|
||||
import win32job
|
||||
if self.job is None:
|
||||
return 0
|
||||
if win32job.QueryInformationJobObject(self.job, win32job.JobObjectBasicProcessIdList):
|
||||
return None
|
||||
self.job.Close(); self.job = None
|
||||
return 0
|
||||
process = subprocess.Popen(command, creationflags=getattr(subprocess, 'CREATE_NO_WINDOW', 0))
|
||||
return NativeBackupSession(process, job, Path(request.lmc_file), request.block_name)
|
||||
|
||||
|
||||
class _NativeBackupProcess:
|
||||
"""Track this visible tool and its descendants without killing on close."""
|
||||
def __init__(self, command, cwd, *, before_resume=None):
|
||||
def __init__(self, command, cwd):
|
||||
import win32con, win32job, win32process
|
||||
self.job = win32job.CreateJobObject(None, '')
|
||||
startup = win32process.STARTUPINFO()
|
||||
@@ -160,8 +80,6 @@ class _NativeBackupProcess:
|
||||
raise
|
||||
try:
|
||||
win32job.AssignProcessToJobObject(self.job, self.handle)
|
||||
if before_resume is not None:
|
||||
before_resume(self)
|
||||
win32process.ResumeThread(thread)
|
||||
except Exception:
|
||||
# No native code has run while suspended; there can be no DB write.
|
||||
@@ -184,54 +102,11 @@ class _NativeBackupProcess:
|
||||
self.handle.Close(); self.job.Close()
|
||||
|
||||
|
||||
def run_native_backup_worker(job, *, admission_state=None):
|
||||
"""Publish admission refusal only when this exact worker never entered native work."""
|
||||
from .desktop_worker import run_native_worker
|
||||
from .management import _write_json
|
||||
from .session_record import IDENTITY_KEYS, process_identity, read_session_record
|
||||
job = Path(job)
|
||||
entered = False
|
||||
request = json.loads(job.read_text('utf-8'))
|
||||
identity = process_identity(os.getpid())
|
||||
def registered():
|
||||
try:
|
||||
path = Path(request['session_record_path'])
|
||||
session = read_session_record(path, evidence_root=job.parent)
|
||||
return (session['operation_id'] == request['operation_id']
|
||||
and session.get('operation') == 'native_backup'
|
||||
and session.get('library') == request['library'] and session.get('block') == request['block']
|
||||
and request.get('project') in session.get('resource_scope', {}).get('projects', ())
|
||||
and any(all(process.get(key) == identity[key] for key in IDENTITY_KEYS)
|
||||
for process in session.get('processes', ()) if process.get('role') == 'worker'))
|
||||
except (OSError, ValueError, KeyError, TypeError):
|
||||
return False # Unknown registration never establishes a safe terminal result.
|
||||
def execute(path):
|
||||
nonlocal entered
|
||||
if not registered():
|
||||
raise ValueError('NATIVE_BACKUP_ADMISSION_UNCONFIRMED: 当前工程与工作进程未登记')
|
||||
entered = True
|
||||
return native_backup_worker_main(path)
|
||||
try:
|
||||
return run_native_worker(execute, job, admission_state=admission_state)
|
||||
except Exception as error:
|
||||
bound = registered()
|
||||
_write_json(job.with_name('result.json'), {'status': 'FAILED', 'detail': str(error),
|
||||
'operation_id': request.get('operation_id'), 'worker_identity': identity,
|
||||
'library': request.get('library'), 'block': request.get('block'),
|
||||
'mode': request.get('mode', 'versions'), 'project': request.get('project'),
|
||||
'database': request.get('database'), 'worker_entered': entered,
|
||||
'native_started': None if entered else False,
|
||||
'safe_to_continue': bound and not entered, 'restore_confirmed': False,
|
||||
'repair_confirmed': False, 'validation_passed': False, 'automatic_repair': False})
|
||||
return 1
|
||||
|
||||
|
||||
def native_backup_worker_main(job, *, process_factory=None):
|
||||
from .library_lock import LibraryLock
|
||||
from .management import _write_json
|
||||
job = Path(job)
|
||||
result = {'status': 'FAILED', 'safe_to_continue': True, 'restore_confirmed': False,
|
||||
'repair_confirmed': False, 'validation_passed': False, 'automatic_repair': False}
|
||||
result = {'status': 'FAILED', 'safe_to_continue': True, 'restore_confirmed': False}
|
||||
native = None
|
||||
def write_evidence(name, value):
|
||||
try:
|
||||
@@ -242,34 +117,14 @@ def native_backup_worker_main(job, *, process_factory=None):
|
||||
try:
|
||||
record = json.loads(job.read_text('utf-8'))
|
||||
library, block = Path(record['library']), record['block']
|
||||
result.update(library=str(library), block=block, operation_id=record.get('operation_id'))
|
||||
from types import SimpleNamespace
|
||||
mode = record.get('mode', 'versions')
|
||||
project, database = native_backup_target(SimpleNamespace(lmc_file=library, block_name=block),
|
||||
mode=mode, target_database=record.get('target_database'))
|
||||
result.update(library=str(library), block=block)
|
||||
project = native_backup_project(library, block)
|
||||
if project != Path(record['project']):
|
||||
raise ValueError('工程身份已变化,未打开原生工具。')
|
||||
if record.get('project_sha256') and hashlib.sha256(project.read_bytes()).hexdigest() != record['project_sha256']:
|
||||
raise ValueError('工程内容身份已变化,未打开原生工具。')
|
||||
if record.get('database') and database != Path(record['database']):
|
||||
raise ValueError('数据库身份已变化,未打开原生工具。')
|
||||
result.update(mode=mode, project=str(project), database=str(database),
|
||||
session_record_path=record.get('session_record_path'))
|
||||
executable = native_backup_executable(record.get('mentor_bin', ''))
|
||||
released = True
|
||||
with LibraryLock(library, checkpoint=bool(record.get('session_record_path')),
|
||||
block_name=block, safe_to_release=lambda: released):
|
||||
from .maintenance_entry import _assert_native_idle_for
|
||||
_assert_native_idle_for(SimpleNamespace(project=project, database=database, library=library))
|
||||
def admitted(process):
|
||||
from .session_record import update_worker_state
|
||||
from .desktop_worker import register_native_writer
|
||||
if record.get('session_record_path'):
|
||||
update_worker_state(record, 'NATIVE_CALL', identities=(('native', process.pid),), required=True)
|
||||
register_native_writer(_BackupJobWriter(process.job))
|
||||
command = [str(executable), '-p', str(project)] # User alone invokes Repair in the official UI.
|
||||
native = (process_factory(command, project.parent) if process_factory else
|
||||
_NativeBackupProcess(command, project.parent, before_resume=admitted))
|
||||
with LibraryLock(library, checkpoint=False, safe_to_release=lambda: released):
|
||||
native = (process_factory or _NativeBackupProcess)([str(executable), '-p', str(project)], project.parent)
|
||||
released = False
|
||||
result.update(status='OPEN', native_pid=native.pid, project=str(project), safe_to_continue=False)
|
||||
write_evidence('state.json', result)
|
||||
@@ -290,7 +145,6 @@ def native_backup_worker_main(job, *, process_factory=None):
|
||||
time.sleep(.25)
|
||||
released = True
|
||||
result.update(status='CLOSED', native_exit_code=exit_code, safe_to_continue=True)
|
||||
result['release'] = {'native_exited': True, 'remaining_pids': [], 'safe_to_continue': True}
|
||||
return 0 if result['native_exit_code'] == 0 else 1
|
||||
except Exception as error:
|
||||
result.update(status='FAILED', detail=str(error), safe_to_continue=native is None)
|
||||
|
||||
@@ -191,21 +191,17 @@ def _normalized_project(path, expected_library):
|
||||
data = path.read_bytes(); encoding = _project_encoding(data)
|
||||
text = data.decode(encoding)
|
||||
refs = re.findall(r'^KEY CentralLibrary "([^"\r\n]*)"', text, re.M)
|
||||
if (not refs or any(not value.strip() for value in refs)
|
||||
or expected_library is not None and any(
|
||||
(path.parent/value).resolve() != expected_library.resolve() for value in refs)):
|
||||
if not refs or any((path.parent/value).resolve() != expected_library.resolve() for value in refs):
|
||||
raise ValueError(f'CentralLibrary reference does not resolve to the approved library: {path}')
|
||||
return re.sub(r'(?m)^(KEY CentralLibrary ")[^"\r\n]*(")',
|
||||
r'\1<CENTRAL_LIBRARY>\2', text).encode(encoding)
|
||||
|
||||
|
||||
def asset_identity(source, expected_library):
|
||||
"""Normalize old library paths when None; imported projects require the exact target."""
|
||||
from .backup_recovery import _project_text
|
||||
source, pcb, top = source_project(source)
|
||||
expected_library = Path(expected_library) if expected_library is not None else None
|
||||
if expected_library is not None and not expected_library.is_file():
|
||||
raise ValueError('Approved CentralLibrary is missing.')
|
||||
expected_library = Path(expected_library)
|
||||
if not expected_library.is_file(): raise ValueError('Approved CentralLibrary is missing.')
|
||||
root = source.parent
|
||||
from .maintenance_entry import maintenance_project_files
|
||||
projects = maintenance_project_files(source, pcb)
|
||||
@@ -240,22 +236,6 @@ def asset_identity(source, expected_library):
|
||||
'layout_sha256': hash_file(pcb.parent/'Layout/LayoutDB.lyt'), 'assets': assets}
|
||||
|
||||
|
||||
def capture_registration_identity(source, evidence_root, *, expected_library):
|
||||
"""File-only import evidence; native database normalization is not semantic proof."""
|
||||
root = Path(evidence_root)
|
||||
try:
|
||||
root.mkdir(parents=True, exist_ok=False)
|
||||
identity = {**asset_identity(source, expected_library),
|
||||
'policy': 'mentor795-import-assets-v1',
|
||||
'coverage': {'primary_assets_checked': True,
|
||||
'schematic_semantics_checked': False}}
|
||||
_write_json(root/'identity.json', {'identity': identity, 'safe_to_continue': True})
|
||||
return IdentityOutcome(identity, True, 'Engineering files and project references checked; no native export.', root)
|
||||
except Exception as error:
|
||||
# No native session was acquired; the caller retains its own release proof.
|
||||
return IdentityOutcome(None, True, str(error), root)
|
||||
|
||||
|
||||
def check_exporters(mentor_home):
|
||||
for name, expected in EXPORTER_PROOF.items():
|
||||
path = Path(mentor_home)/('wv/win32/bin' if name == 'edifExporter.exe' else 'iCDB/win32/bin')/name
|
||||
@@ -305,54 +285,9 @@ def _database_released(project_root):
|
||||
return True
|
||||
|
||||
|
||||
def _process_birth(value):
|
||||
from datetime import datetime, timezone, timedelta
|
||||
if not value:
|
||||
return None
|
||||
if isinstance(value, datetime):
|
||||
return value.astimezone(timezone.utc)
|
||||
if re.fullmatch(r'\d{14}\.\d{6}[+-]\d{3}', value):
|
||||
zone = timezone(timedelta(minutes=int(value[21:])))
|
||||
return datetime.strptime(value[:21], '%Y%m%d%H%M%S.%f').replace(tzinfo=zone).astimezone(timezone.utc)
|
||||
try:
|
||||
parsed = datetime.fromisoformat(value)
|
||||
if parsed.tzinfo is not None:
|
||||
return parsed.astimezone(timezone.utc)
|
||||
except ValueError:
|
||||
pass
|
||||
return value
|
||||
|
||||
|
||||
def _export_descendants(snapshot, tracked, existing):
|
||||
"""A historical parent PID is not evidence of current parentage."""
|
||||
from datetime import datetime
|
||||
rows = {row['pid']: row for row in snapshot}
|
||||
def matches(row):
|
||||
birth = _process_birth(row.get('created'))
|
||||
return tracked[row['pid']] is None or birth is None or tracked[row['pid']] == birth
|
||||
changed = True
|
||||
while changed:
|
||||
changed = False
|
||||
for row in snapshot:
|
||||
if row['pid'] in tracked or row['parent'] not in tracked:
|
||||
continue
|
||||
birth = _process_birth(row.get('created'))
|
||||
if (row['pid'], birth) in existing:
|
||||
continue
|
||||
parent = rows.get(row['parent'])
|
||||
parent_birth = tracked[row['parent']]
|
||||
if parent is not None and not matches(parent):
|
||||
continue
|
||||
if isinstance(birth, datetime) and isinstance(parent_birth, datetime) and birth < parent_birth:
|
||||
continue
|
||||
tracked[row['pid']] = birth
|
||||
changed = True
|
||||
return [row for row in snapshot if row['pid'] in tracked and matches(row)]
|
||||
|
||||
|
||||
def _run_exports(project, root, mentor_home, timeout_seconds):
|
||||
"""Observe exact exporter/descendant handles; never kill a database owner."""
|
||||
import win32api, win32con, win32event, win32process, pywintypes
|
||||
import win32api, win32con, win32event, pywintypes
|
||||
root = Path(root)
|
||||
try:
|
||||
_write_json(root/'export-launch.json', {'started': False})
|
||||
@@ -403,32 +338,27 @@ def _run_exports(project, root, mentor_home, timeout_seconds):
|
||||
creationflags=subprocess.CREATE_NO_WINDOW)
|
||||
record['native_started'] = True
|
||||
record['pid'] = process.pid
|
||||
handle = getattr(process, '_handle', None)
|
||||
birth = _process_birth(win32process.GetProcessTimes(handle)['CreationTime']) if handle is not None else None
|
||||
descendants = {process.pid: birth}
|
||||
existing = {(p['pid'], _process_birth(p.get('created'))) for p in before}
|
||||
if birth is not None:
|
||||
record['root_created'] = birth.isoformat()
|
||||
descendants = {process.pid}
|
||||
_write_json(root/(kind+'-process.json'), record)
|
||||
while time.monotonic() < deadline:
|
||||
snapshot = _process_snapshot()
|
||||
owned = {p['pid'] for p in _export_descendants(snapshot, descendants, existing)}
|
||||
owners = [p for p in snapshot if p['pid'] in owned or (
|
||||
changed = True
|
||||
while changed:
|
||||
previous = len(descendants)
|
||||
descendants.update(p['pid'] for p in snapshot if p['parent'] in descendants)
|
||||
changed = len(descendants) != previous
|
||||
owners = [p for p in snapshot if p['pid'] in descendants or (
|
||||
p['name'].casefold() in _OWNER_NAMES and _native_scope_match(
|
||||
p.get('command', ''), roots=(project.parent,)) is True)]
|
||||
for owner in owners:
|
||||
if owner['pid'] not in handles:
|
||||
try: handles[owner['pid']] = win32api.OpenProcess(win32con.SYNCHRONIZE, False, owner['pid'])
|
||||
except pywintypes.error as error:
|
||||
if error.winerror not in (5, 87): raise
|
||||
# A dying process can deny OpenProcess. Keep it in
|
||||
# owners until a fresh snapshot proves it absent.
|
||||
record.setdefault('process_observation_errors', {})[str(owner['pid'])] = {
|
||||
'winerror': error.winerror, 'detail': str(error)}
|
||||
record['observed_pids'] = sorted(descendants.keys() | handles.keys())
|
||||
for owner in owners:
|
||||
identities.setdefault(owner['pid'],
|
||||
{key: owner.get(key, '') for key in ('pid', 'created', 'executable')})
|
||||
if error.winerror != 87: raise
|
||||
record['observed_pids'] = sorted(descendants | handles.keys())
|
||||
identities.update({owner['pid']:
|
||||
{key: owner.get(key, '') for key in ('pid', 'created', 'executable')}
|
||||
for owner in owners})
|
||||
record['process_identities'] = list(identities.values())
|
||||
if (process.poll() is not None and not owners
|
||||
and all(win32event.WaitForSingleObject(h, 0) == win32con.WAIT_OBJECT_0 for h in handles.values())):
|
||||
|
||||
@@ -1,45 +1,12 @@
|
||||
"""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
|
||||
|
||||
from .management import _write_json
|
||||
|
||||
|
||||
def _preexisting_export_pids(record, snapshot=None, *, project_root=None):
|
||||
from datetime import datetime
|
||||
from .native_engineering_identity import _process_birth
|
||||
identities = record.get('process_identities', [])
|
||||
root = next((p for p in identities if p.get('pid') == record.get('pid')), {})
|
||||
birth = _process_birth(record.get('root_created') or root.get('created'))
|
||||
if not isinstance(birth, datetime):
|
||||
return set()
|
||||
earlier = [p for p in identities if p.get('pid') != record.get('pid')
|
||||
and isinstance(_process_birth(p.get('created')), datetime)
|
||||
and _process_birth(p['created']) < birth]
|
||||
if not earlier:return set()
|
||||
from .native_engineering_identity import _process_snapshot,_OWNER_NAMES
|
||||
from .backup_recovery import _native_scope_match
|
||||
import ntpath
|
||||
current={p['pid']:p for p in (_process_snapshot() if snapshot is None else snapshot)}
|
||||
native_names=_OWNER_NAMES|{'viewdraw.exe','expeditionpcb.exe','librarymanager.exe',
|
||||
'icdbprojectbackup.exe','reuseblockimporter.exe'}
|
||||
excluded=set()
|
||||
for recorded in earlier:
|
||||
actual=current.get(recorded['pid'])
|
||||
if (actual is None or _process_birth(actual.get('created'))!=_process_birth(recorded['created'])
|
||||
or not recorded.get('executable') or not actual.get('executable')
|
||||
or ntpath.normcase(actual['executable'])!=ntpath.normcase(recorded['executable'])):
|
||||
continue
|
||||
match=_native_scope_match(actual.get('command',''),roots=(project_root,)) if project_root is not None else None
|
||||
if match is True or match is None and actual.get('name','').casefold() in native_names:
|
||||
continue
|
||||
excluded.add(recorded['pid'])
|
||||
return excluded
|
||||
|
||||
|
||||
def assert_retained_exports_idle(library=None):
|
||||
import win32con, win32event
|
||||
from .native_engineering_identity import _retained_exports
|
||||
@@ -50,36 +17,13 @@ def assert_retained_exports_idle(library=None):
|
||||
if (library is not None and scope.get('library')
|
||||
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,project_root=Path(scope['analysis_root'])/'project'))
|
||||
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.'
|
||||
+ (' '+exclusion_error if exclusion_error else ''))
|
||||
if process.poll() is None or any(win32event.WaitForSingleObject(handle, 0) != win32con.WAIT_OBJECT_0
|
||||
for handle in handles.values()):
|
||||
raise LibraryBusy('Native identity exporter or descendant has not released.')
|
||||
|
||||
|
||||
def begin_export_analysis(library, root, project):
|
||||
from .library_lock import LibraryLock, _library_guard, blocker_path, checkpoint_record, LibraryBusy
|
||||
from .library_lock import _guard, blocker_path, checkpoint_record, LibraryBusy
|
||||
from .management_transaction import current_lease
|
||||
library, root, project = Path(library).resolve(), Path(root).resolve(), Path(project).resolve()
|
||||
owner = current_lease(library)
|
||||
@@ -89,7 +33,7 @@ def begin_export_analysis(library, root, project):
|
||||
record = {'protocol': 'cbb-native-export-analysis', 'version': 1, 'token': uuid4().hex,
|
||||
'library': str(library), 'lease_id': owner['lease_id'], 'supervisor_pid': owner['supervisor_pid'],
|
||||
'analysis_root': str(root), 'project': str(project)}
|
||||
with _library_guard(LibraryLock(library).key):
|
||||
with _guard:
|
||||
marker = blocker_path(library)
|
||||
checkpoint = checkpoint_record(marker)
|
||||
if (checkpoint is None or checkpoint['lease_id'] != owner['lease_id']
|
||||
@@ -100,77 +44,6 @@ def begin_export_analysis(library, root, project):
|
||||
return record['token']
|
||||
|
||||
|
||||
def _external_export_library(process):
|
||||
"""Recover a live copy's owner; an outside path alone proves no association."""
|
||||
import ntpath
|
||||
import re
|
||||
import stat
|
||||
import subprocess
|
||||
from .failed_session import _command_args
|
||||
from .backup_recovery import _native_scope_match
|
||||
from .native_engineering_identity import _process_birth
|
||||
def read(path):
|
||||
info = path.lstat()
|
||||
if info.st_file_attributes & stat.FILE_ATTRIBUTE_REPARSE_POINT or info.st_size > 1024*1024:
|
||||
raise ValueError('Untrusted export association')
|
||||
value = json.loads(path.read_text('utf-8'))
|
||||
if not isinstance(value, dict):
|
||||
raise ValueError('Invalid export association')
|
||||
return value
|
||||
try:
|
||||
birth = _process_birth(process.get('created'))
|
||||
image = process.get('executable')
|
||||
if birth is None or not image or ntpath.basename(image).casefold() != process['name'].casefold():
|
||||
return None
|
||||
candidates = []
|
||||
for arg in _command_args(process.get('command', ''))[1:]:
|
||||
path = Path(arg.split('=', 1)[-1])
|
||||
if path.is_absolute() and (path.suffix.casefold() in ('.prj', '.pcb')
|
||||
or path.name.casefold() in ('database', 'icdb.dat')):
|
||||
candidates.append(path)
|
||||
associations = set()
|
||||
for path in candidates:
|
||||
project_root = next((p for p in (path, *path.parents) if p.name.casefold() == 'project'), None)
|
||||
if project_root is None or project_root.resolve() != project_root:
|
||||
return None
|
||||
root = project_root.parent
|
||||
owner = read(root/'export-owner.json')
|
||||
project, library = Path(owner['project']), Path(owner['library'])
|
||||
if (owner.get('protocol') != 'cbb-native-export-analysis' or owner.get('version') != 1
|
||||
or not re.fullmatch('[0-9a-f]{32}', str(owner.get('token', '')))
|
||||
or not re.fullmatch('[0-9a-f]{32}', str(owner.get('lease_id', '')))
|
||||
or type(owner.get('supervisor_pid')) is not int or owner['supervisor_pid'] <= 0
|
||||
or Path(owner['analysis_root']) != root or project.parent != project_root
|
||||
or project.suffix.casefold() != '.prj' or not project.is_file()
|
||||
or not library.is_absolute() or library.suffix.casefold() != '.lmc' or not library.is_file()
|
||||
or root.is_relative_to(library.parent) or library.parent.is_relative_to(root)
|
||||
or _native_scope_match(process['command'], roots=(project_root,)) is not True):
|
||||
return None
|
||||
matched = False
|
||||
for kind, executable in (('ascii', 'icdb2ascii.exe'), ('csv', 'icdb2csv.exe'), ('edif', 'edifexporter.exe')):
|
||||
evidence = root/(kind+'-process.json')
|
||||
if not evidence.exists():
|
||||
continue
|
||||
recorded = read(evidence)
|
||||
command = recorded.get('command')
|
||||
if (recorded.get('native_started') is not True or recorded.get('kind') != kind
|
||||
or not isinstance(command, list) or not command or not all(isinstance(v, str) for v in command)
|
||||
or ntpath.basename(command[0]).casefold() != executable
|
||||
or _native_scope_match(subprocess.list2cmdline(command), roots=(project_root,)) is not True):
|
||||
continue
|
||||
for identity in recorded.get('process_identities', []):
|
||||
if (identity.get('pid') == process['pid'] and _process_birth(identity.get('created')) == birth
|
||||
and identity.get('executable')
|
||||
and ntpath.normcase(identity['executable']) == ntpath.normcase(image)):
|
||||
matched = True
|
||||
if not matched:
|
||||
return None
|
||||
associations.add(library.resolve())
|
||||
return next(iter(associations)) if len(associations) == 1 else None
|
||||
except (OSError, ValueError, KeyError, TypeError, AttributeError):
|
||||
return None
|
||||
|
||||
|
||||
@contextmanager
|
||||
def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, unstarted_token=''):
|
||||
"""Fresh process and exclusive-copy proof, including after interpreter exit."""
|
||||
@@ -187,12 +60,9 @@ def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, uns
|
||||
raise LibraryBusy('Invalid library checkpoint cannot release export ownership.')
|
||||
# Only the explicit release path supplies full-library/native proof and
|
||||
# archives the unchanged metadata while its coordination handle is held.
|
||||
for process in _process_snapshot():
|
||||
if process['name'].casefold() not in _OWNER_NAMES:
|
||||
continue
|
||||
associated_library = _external_export_library(process)
|
||||
if associated_library is None or associated_library == library:
|
||||
raise LibraryBusy('Unknown export checkpoint still has a possible native identity owner.')
|
||||
assert_retained_exports_idle()
|
||||
if any(p['name'].casefold() in _OWNER_NAMES for p in _process_snapshot()):
|
||||
raise LibraryBusy('Unknown export checkpoint still has a possible native identity owner.')
|
||||
yield []
|
||||
return
|
||||
if checkpoint is None or 'export_analysis' not in checkpoint:
|
||||
@@ -249,18 +119,12 @@ def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, uns
|
||||
if any(not isinstance(pid, int) or pid <= 0 for pid in pids):
|
||||
raise ValueError('Invalid export process identity.')
|
||||
identities = {p['pid']: p for p in process.get('process_identities', [])}
|
||||
excluded = _preexisting_export_pids(process,snapshot,project_root=project.parent)
|
||||
def original_alive(pid):
|
||||
if pid in excluded:
|
||||
return False
|
||||
recorded = identities.get(pid, {})
|
||||
current = next((p for p in snapshot if p['pid'] == pid), None)
|
||||
if recorded.get('created') and current and current.get('created'):
|
||||
from datetime import datetime
|
||||
from .native_engineering_identity import _process_birth
|
||||
before,now=_process_birth(recorded['created']),_process_birth(current['created'])
|
||||
if isinstance(before,datetime) and isinstance(now,datetime):
|
||||
return before==now
|
||||
return (recorded['created'] == current['created']
|
||||
and recorded.get('executable') == current.get('executable'))
|
||||
return any(p['pid'] == pid for p in snapshot) or _supervisor_alive(pid)
|
||||
if any(original_alive(pid) for pid in pids):
|
||||
raise LibraryBusy('A recorded export process or descendant remains alive.')
|
||||
@@ -282,8 +146,8 @@ def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, uns
|
||||
|
||||
|
||||
def finish_export_analysis(library, token, *, native_not_started=False):
|
||||
from .library_lock import LibraryLock, _library_guard, blocker_path, checkpoint_record, LibraryBusy
|
||||
with _library_guard(LibraryLock(library).key), prove_export_copies_released(library,
|
||||
from .library_lock import _guard, blocker_path, checkpoint_record, LibraryBusy
|
||||
with _guard, prove_export_copies_released(library,
|
||||
unstarted_token=token if native_not_started else ''):
|
||||
marker = blocker_path(library)
|
||||
checkpoint = checkpoint_record(marker)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""Version-pinned native import/removal, private desktop transport and catalog.
|
||||
"""Version-pinned native adapter, private desktop transport and strict catalog.
|
||||
|
||||
Normal import checks native registration and engineering files without invoking
|
||||
the independent schematic exporters. Optional Verify determines READY.
|
||||
The installed Tcl CleanWGLib/F4 contract has isolated removal proof. Discovery
|
||||
of an Add dialog is deliberately insufficient to enable production Add/Update.
|
||||
"""
|
||||
from dataclasses import asdict, replace
|
||||
import ctypes
|
||||
@@ -53,10 +53,9 @@ def removal_output_ok(code, output, name, partition):
|
||||
+ r"' from partition '" + re.escape(partition) + r"'\.", output) is not None)
|
||||
|
||||
|
||||
def catalog_dialog_action(title, text, *, read_only=False):
|
||||
def catalog_dialog_action(title, text):
|
||||
value = (title + '\n' + text).casefold()
|
||||
if ('this central library must be updated' in value or 'select flow type' in value
|
||||
or read_only and ('save' in value or 'upgrade' in value)):
|
||||
if ('this central library must be updated' in value or 'select flow type' in value):
|
||||
return 'cancel'
|
||||
return 'observe'
|
||||
|
||||
@@ -70,18 +69,9 @@ class NativeManagementAdapter:
|
||||
self.mapped_drive = ''
|
||||
self.mapped_remote_root = ''
|
||||
self._pending_workers = {}
|
||||
self.stop = None
|
||||
self.session_progress = None
|
||||
self.write_admission = None
|
||||
|
||||
def bind_stop(self, stop):
|
||||
self.stop = stop
|
||||
|
||||
def bind_write_admission(self, admission):
|
||||
self.write_admission=admission
|
||||
|
||||
def release_confirmed(self, library):
|
||||
"""Worker exit/result files do not replace independent resource proof."""
|
||||
"""Reap only this adapter's timed-out worker after its own release result."""
|
||||
key = str(Path(library).resolve()).casefold()
|
||||
pending = self._pending_workers.get(key)
|
||||
if pending is None:
|
||||
@@ -90,17 +80,10 @@ class NativeManagementAdapter:
|
||||
if worker.poll() is None:
|
||||
return False
|
||||
try:
|
||||
if (evidence/'session.json').is_file():
|
||||
from .session_record import reconcile_session_record
|
||||
proof = reconcile_session_record(evidence/'session.json', evidence_root=evidence)
|
||||
if proof['status'] != 'RELEASED':
|
||||
return False
|
||||
else:
|
||||
from .library_lock import release_retained_library
|
||||
proof = release_retained_library(library, evidence/'release-proof')
|
||||
if proof.get('status') != 'RELEASE_CONFIRMED':
|
||||
return False
|
||||
except Exception:
|
||||
result = json.loads((evidence/'result.json').read_text(encoding='utf-8'))
|
||||
if result.get('safe_to_continue') is not True:
|
||||
return False
|
||||
except (OSError, ValueError, TypeError, AttributeError):
|
||||
return False
|
||||
worker.close()
|
||||
if worker in _retained_workers:
|
||||
@@ -136,12 +119,17 @@ class NativeManagementAdapter:
|
||||
|
||||
def capabilities(self):
|
||||
reason = self._binary_capability()
|
||||
add_reason = reason
|
||||
if not add_reason:
|
||||
from .native_engineering_identity import check_exporters
|
||||
try: check_exporters(self.home)
|
||||
except (ValueError, OSError, TypeError) as error: add_reason = str(error)
|
||||
return {
|
||||
'remove': Capability(not reason, reason or '已验证 CleanWGLib/F4;仅 ASCII 名称、Logical-Physical 和 DxDesigner 库。'),
|
||||
'add': Capability(not reason and _PRODUCTION_ADD_VALIDATED, reason or
|
||||
'EE7.9.5 原生导入及工程关联复读;仅 ASCII 名称、Logical-Physical 和 DxDesigner 库。'),
|
||||
'update': Capability(not reason and _PRODUCTION_ADD_VALIDATED and _PRODUCTION_UPDATE_VALIDATED,
|
||||
reason or '同名原生替换:移除并重新导入;操作前请手动备份。'),
|
||||
'add': Capability(not add_reason and _PRODUCTION_ADD_VALIDATED, add_reason or
|
||||
'已验证 EE7.9.5 原生导入及完整工程复读;仅 ASCII 名称、Logical-Physical 和 DxDesigner 库。'),
|
||||
'update': Capability(not add_reason and _PRODUCTION_ADD_VALIDATED and _PRODUCTION_UPDATE_VALIDATED,
|
||||
add_reason or '已验证同名原生替换:移除并重新导入;操作前请手动备份。'),
|
||||
}
|
||||
|
||||
def _worker(self, job, evidence):
|
||||
@@ -220,13 +208,6 @@ class NativeManagementAdapter:
|
||||
|
||||
def _launch_worker_observed(self, job, evidence, state):
|
||||
from .desktop_worker import DesktopWorker
|
||||
from .session_record import process_identity
|
||||
job = {**job, 'cancel_signal': str(evidence/'cancel-management.signal'),
|
||||
'start_gate': str(evidence/'start-management.signal'),
|
||||
'start_gate_protocol': 'event-v1',
|
||||
'session_record_path': str(evidence/'session.json'), 'operation_id': uuid4().hex,
|
||||
'supervisor_pid': os.getpid(), 'supervisor_identity': process_identity(os.getpid()),
|
||||
'block': job.get('name')}
|
||||
request_path = evidence/'request.json'
|
||||
desktop, timeout = job['desktop'], job['timeout_seconds']
|
||||
deadline = time.monotonic() + timeout
|
||||
@@ -240,32 +221,13 @@ class NativeManagementAdapter:
|
||||
worker = (self.worker_factory or DesktopWorker)(command + ['--management-worker', str(request_path)], desktop)
|
||||
state['worker'] = worker
|
||||
worker.cbb_library = str(Path(job['library']).resolve())
|
||||
if hasattr(worker, 'bind_cancellation'):
|
||||
worker.bind_cancellation(job['cancel_signal'])
|
||||
if hasattr(worker, 'bind_session'):
|
||||
worker.bind_session(job)
|
||||
from contextlib import nullcontext
|
||||
from .operation_queue import commit_worker_start, native_channel
|
||||
# Only admitted native waiting outlives the UI's metadata deadline.
|
||||
channel = native_channel(read_only=True) if job.get('worker_role') == 'catalog_readonly' else nullcontext()
|
||||
with channel:
|
||||
commit_worker_start(worker, job)
|
||||
while worker.poll() is None and time.monotonic() < deadline:
|
||||
if self.stop is not None and self.stop.is_set():
|
||||
Path(job['cancel_signal']).touch()
|
||||
break
|
||||
time.sleep(.1)
|
||||
while worker.poll() is None and time.monotonic() < deadline:
|
||||
time.sleep(.1)
|
||||
if worker.poll() is None:
|
||||
# DesktopWorker.close() requests a kill without a cancellation file.
|
||||
# Keep this exact worker alive until its native call returns normally.
|
||||
_retained_workers.append(worker)
|
||||
self._pending_workers[str(Path(job['library']).resolve()).casefold()] = (worker, evidence)
|
||||
Path(job['cancel_signal']).touch()
|
||||
if getattr(worker, 'session_record_path', None):
|
||||
from .session_record import handoff_session
|
||||
handoff_session(worker.session_record_path, evidence_root=evidence, process=worker,
|
||||
progress=(lambda value: self.session_progress({'stage': 'session_observation', **value}))
|
||||
if self.session_progress is not None else None)
|
||||
if add_job:
|
||||
(evidence/'cancel-native-add.signal').touch()
|
||||
return {'success': False, 'safe_to_continue': False,
|
||||
@@ -282,8 +244,7 @@ class NativeManagementAdapter:
|
||||
worker.close()
|
||||
|
||||
def catalog(self, library, evidence):
|
||||
result = self._worker({'operation': 'catalog', 'worker_role': 'catalog_readonly',
|
||||
'library': str(absolute_preserving_drive(library))}, evidence)
|
||||
result = self._worker({'operation': 'catalog', 'library': str(absolute_preserving_drive(library))}, evidence)
|
||||
if not result.get('success') or not result.get('safe_to_continue'):
|
||||
raise NativeOperationError(result.get('detail', '原生目录复读未确认,禁止文件夹回退。'),
|
||||
safe_to_continue=result.get('safe_to_continue') is True)
|
||||
@@ -308,47 +269,26 @@ class NativeManagementAdapter:
|
||||
removal_input(request.name, request.partition)
|
||||
if request.partition != 'Logical-Physical' or catalog.flow != 1:
|
||||
raise ValueError('仅验证了 DxDesigner / Logical-Physical 管理操作。')
|
||||
self.validate_source(request)
|
||||
|
||||
def validate_source(self, request, *, probe_files=True):
|
||||
if request.operation not in ('add', 'update'):
|
||||
return
|
||||
if request.source is None:
|
||||
raise ValueError('请选择完整来源工程。')
|
||||
source = Path(request.source)
|
||||
if probe_files:
|
||||
source = source.resolve(strict=True)
|
||||
if source.suffix.casefold() != '.prj' or probe_files and not source.is_file():
|
||||
raise ValueError('请选择完整来源工程的 PRJ 文件。')
|
||||
if source.stem.casefold() != request.name.casefold():
|
||||
raise ValueError(f'SOURCE_NAME_MISMATCH: 来源工程名 {source.stem} 与目标 {request.name} 不一致;'
|
||||
'当前版本不支持改名,请重新选择同名 PRJ。')
|
||||
|
||||
def add(self, request, evidence):
|
||||
# Route readiness never grants production mutation authority.
|
||||
capability = self.capabilities()['add']
|
||||
if not capability.supported:
|
||||
return NativeOutcome(False, True, capability.reason, evidence_path=Path(evidence))
|
||||
try:
|
||||
self.validate_source(request)
|
||||
except (OSError, ValueError) as error:
|
||||
return NativeOutcome(False, True, str(error), evidence_path=Path(evidence))
|
||||
return self._add_transaction(request, Path(evidence))
|
||||
|
||||
def prepare_add_transaction(self, request, root, *, original_source):
|
||||
from .native_engineering_identity import asset_identity, capture_registration_identity, IdentityOutcome
|
||||
from .native_engineering_identity import project_library, asset_identity, capture_identity, IdentityOutcome
|
||||
from .native_add_failures import validate_native_copy_paths
|
||||
from .management_transaction import current_lease, prepare_transaction
|
||||
from .management import source_project
|
||||
from .backup_recovery import _align_library
|
||||
try:
|
||||
self.validate_source(request)
|
||||
if not self.capabilities()['add'].supported:
|
||||
raise ValueError(self.capabilities()['add'].reason)
|
||||
validate_native_copy_paths(request.source, request.library, request.name)
|
||||
current_lease(request.library)
|
||||
# The selected destination replaces old library paths in the staged copy.
|
||||
original_assets = asset_identity(original_source, None)
|
||||
original_assets = asset_identity(original_source, project_library(original_source))
|
||||
staged, pcb, _ = source_project(request.source, request.top_level_block)
|
||||
if staged.parent != Path(root).resolve()/'source':
|
||||
raise ValueError('Only the engine staged source can be aligned for native Add.')
|
||||
@@ -357,7 +297,8 @@ class NativeManagementAdapter:
|
||||
raise ValueError('Staged engineering assets differ from the original source.')
|
||||
except Exception as error:
|
||||
return request, IdentityOutcome(None, True, str(error), Path(root))
|
||||
proof = capture_registration_identity(staged, Path(root)/'source-identity', expected_library=request.library)
|
||||
proof = capture_identity(staged, Path(root)/'source-identity', expected_library=request.library,
|
||||
owner_library=request.library, mentor_home=self.home, timeout_seconds=request.timeout_seconds)
|
||||
if proof.identity is None or not proof.safe_to_continue:
|
||||
return request, proof
|
||||
try:
|
||||
@@ -371,7 +312,7 @@ class NativeManagementAdapter:
|
||||
from contextlib import contextmanager
|
||||
from .management_transaction import validate_transaction
|
||||
from .library_lock import LibraryLock
|
||||
from .native_engineering_identity import capture_registration_identity, project_library
|
||||
from .native_engineering_identity import capture_identity, project_library
|
||||
from .management import source_project
|
||||
from .backup_recovery import _align_library, _idle_check
|
||||
try:
|
||||
@@ -410,12 +351,8 @@ class NativeManagementAdapter:
|
||||
if len(projects) != 1:
|
||||
return NativeOutcome(True, owner_safe, 'Registered engineering project is not unique.',
|
||||
identity_matches=False, evidence_path=evidence)
|
||||
target, pcb, _ = source_project(projects[0])
|
||||
if self.write_admission is None:
|
||||
_idle_check(request.library,target,pcb)
|
||||
else:
|
||||
_idle_check(request.library,target,pcb,confirmation=self.write_admission,
|
||||
evidence=evidence,block=request.name)
|
||||
target, pcb, _ = source_project(projects[0], request.top_level_block)
|
||||
_idle_check(request.library, target, pcb)
|
||||
from .maintenance_entry import maintenance_project_files
|
||||
project_files = maintenance_project_files(target, pcb)
|
||||
before_refs = {str(p): hash_file(p) for p in project_files}
|
||||
@@ -432,31 +369,18 @@ class NativeManagementAdapter:
|
||||
or catalog.flow != 1 or len(entries) != 1):
|
||||
return NativeOutcome(True, owner_safe, 'Aligned target did not reopen with the exact catalog identity.',
|
||||
identity_matches=False, evidence_path=evidence)
|
||||
proof = capture_registration_identity(target, evidence/'registered-identity', expected_library=request.library)
|
||||
# File-only content evidence cannot change the catalog owner's exit proof.
|
||||
expected, registered = prepared['expected_identity'], proof.identity
|
||||
# Native Add rewrites PRJ metadata and runtime history. Registration
|
||||
# identity uses the top block and Layout; other file diffs are evidence.
|
||||
allowed_tops = (expected['top_level_block'], request.name)
|
||||
matched = (registered is not None and registered['top_level_block'] in allowed_tops
|
||||
and registered['layout_sha256'] == expected['layout_sha256'])
|
||||
before_assets, after_assets = expected['assets'], (registered or {}).get('assets', {})
|
||||
differences = {'added': sorted(after_assets.keys()-before_assets.keys()),
|
||||
'deleted': sorted(before_assets.keys()-after_assets.keys()),
|
||||
'modified': sorted(key for key in before_assets.keys() & after_assets.keys()
|
||||
if before_assets[key] != after_assets[key])}
|
||||
assets_match = registered is not None and not any(differences.values())
|
||||
owner_safe = False
|
||||
proof = capture_identity(target, evidence/'registered-identity', expected_library=request.library,
|
||||
owner_library=request.library, mentor_home=self.home, timeout_seconds=request.timeout_seconds)
|
||||
owner_safe = proof.safe_to_continue
|
||||
matched = proof.identity is not None and proof.identity == prepared['expected_identity']
|
||||
_write_json(evidence/'identity-comparison.json', {'identity_matches': matched,
|
||||
'assets_match': assets_match, 'asset_differences': differences,
|
||||
'top_level_block_mapping': {'source': expected['top_level_block'],
|
||||
'registered': (registered or {}).get('top_level_block'), 'allowed': list(allowed_tops)},
|
||||
'expected': expected, 'registered': registered,
|
||||
'expected': prepared['expected_identity'], 'registered': proof.identity,
|
||||
'safe_to_continue': owner_safe, 'detail': proof.detail})
|
||||
return NativeOutcome(True, owner_safe,
|
||||
('原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。'
|
||||
+ ('其他工程文件有差异,已记录供核对。' if not assets_match else '')) if matched else
|
||||
'原生注册成功,但工程关联、顶层块或 Layout 未确认一致:'+proof.detail,
|
||||
identity_matches=matched, evidence_path=evidence, identity_proof=registered)
|
||||
'Native ASCII/CSV/EDIF, physical assets and library references match.' if matched else
|
||||
'Native registration succeeded but complete engineering identity proof did not match: '+proof.detail,
|
||||
identity_matches=matched, evidence_path=evidence, identity_proof=proof.identity)
|
||||
|
||||
def add_owned_fixture(self, request, evidence, *, probe_token):
|
||||
"""Research only: stage and back up a token-bound, actively leased fixture."""
|
||||
@@ -470,7 +394,6 @@ class NativeManagementAdapter:
|
||||
return NativeOutcome(False, True, 'Native Add requires an existing staged PRJ source project.',
|
||||
evidence_path=evidence)
|
||||
try:
|
||||
self.validate_source(request)
|
||||
source_identity = engineering_identity(source)
|
||||
except (ValueError, OSError) as error:
|
||||
return NativeOutcome(False, True, f'Unable to read source engineering identity: {error}',
|
||||
@@ -508,10 +431,13 @@ class _OwnedFixtureManagementAdapter(NativeManagementAdapter):
|
||||
|
||||
def capabilities(self):
|
||||
from .management_transaction import fixture_authority
|
||||
from .native_engineering_identity import check_exporters
|
||||
fixture = self._fixture_authority
|
||||
fixture_authority(fixture['root'], Path(fixture['root'])/'native-add/fixture/mentor_lib.lmc', fixture['token'])
|
||||
caps = super().capabilities()
|
||||
reason = self._binary_capability()
|
||||
try: check_exporters(self.home)
|
||||
except (ValueError, OSError) as error: reason = str(error)
|
||||
for operation in ('add', 'update'):
|
||||
caps[operation] = Capability(not reason, reason or 'Owned fixture engine validation only; production capability unchanged.')
|
||||
return caps
|
||||
@@ -715,11 +641,11 @@ def _dispatch_diagnostics(root, stage, app, library, *, paths=None):
|
||||
stream.write(json.dumps(record, ensure_ascii=False, default=str) + '\n')
|
||||
|
||||
|
||||
def _set_probe_field(hwnd, control_id, expected, root, *, read_only=False):
|
||||
"""Set/read or revalidate a remote Edit with a one-second total message budget."""
|
||||
def _set_probe_field(hwnd, control_id, expected, root):
|
||||
"""Set/read a remote Edit with a one-second total message budget."""
|
||||
from ctypes import wintypes
|
||||
record = {'control_id': control_id, 'hwnd': int(hwnd), 'expected': expected,
|
||||
'actual': None, 'matched': False, 'read_only': read_only}
|
||||
'actual': None, 'matched': False}
|
||||
deadline = time.monotonic() + 1.0
|
||||
try:
|
||||
user32 = ctypes.WinDLL('user32', use_last_error=True)
|
||||
@@ -736,10 +662,9 @@ def _set_probe_field(hwnd, control_id, expected, root, *, read_only=False):
|
||||
remaining, ctypes.byref(returned)):
|
||||
raise TimeoutError(f'原生字段消息超时或失败:{control_id}, Windows={ctypes.get_last_error()}')
|
||||
return returned.value
|
||||
if not read_only:
|
||||
text = ctypes.create_unicode_buffer(expected)
|
||||
if not message(0x000C, 0, text): # WM_SETTEXT
|
||||
raise RuntimeError(f'原生字段拒绝写入:{control_id}')
|
||||
text = ctypes.create_unicode_buffer(expected)
|
||||
if not message(0x000C, 0, text): # WM_SETTEXT
|
||||
raise RuntimeError(f'原生字段拒绝写入:{control_id}')
|
||||
buffer = ctypes.create_unicode_buffer(32768)
|
||||
copied = message(0x000D, len(buffer), buffer) # WM_GETTEXT, remote Edit marshalled by Windows.
|
||||
record['actual'] = buffer.value
|
||||
@@ -760,46 +685,13 @@ def _set_probe_field(hwnd, control_id, expected, root, *, read_only=False):
|
||||
def _probe_add_dialog(app, job, desktop, owned_pids, root, *, library=None):
|
||||
try:
|
||||
return _probe_add_dialog_impl(app, job, desktop, owned_pids, root, library=library)
|
||||
except Exception as error:
|
||||
if job.get('_native_add_pending') and str(error).startswith('NATIVE_ADD_FAILED:'):
|
||||
try:
|
||||
failure = json.loads((Path(root)/'native-add-output.json').read_text('utf-8')).get('failure', {})
|
||||
if failure.get('acknowledged') is True:
|
||||
job['_native_add_pending'] = False
|
||||
from .session_record import update_worker_state
|
||||
update_worker_state(job, 'POSTCALL')
|
||||
except (OSError, ValueError, AttributeError):
|
||||
pass
|
||||
raise
|
||||
finally:
|
||||
import gc
|
||||
gc.collect() # Release UIA wrappers before closing native child dialogs.
|
||||
if not job.get('_native_add_pending'):
|
||||
writer = job.pop('_native_add_writer', None)
|
||||
if writer is not None:
|
||||
writer.complete()
|
||||
_close_probe_dialogs(desktop, owned_pids)
|
||||
|
||||
|
||||
def _require_management_continuation(job, root):
|
||||
"""Check before a new native call; never abort a call already on the stack."""
|
||||
from .library_lock import _supervisor_alive
|
||||
cancelled = job.get('cancel_signal') and Path(job['cancel_signal']).exists()
|
||||
supervisor = job.get('supervisor_pid')
|
||||
if cancelled or supervisor is None or not _supervisor_alive(supervisor):
|
||||
raise RuntimeError('MANAGEMENT_CANCELLED: 操作已停止或监督器已退出,未提交新的原生调用')
|
||||
if job.get('supervisor_identity'):
|
||||
from .session_record import process_identity, IDENTITY_KEYS
|
||||
actual = process_identity(supervisor)
|
||||
if any(actual[k] != job['supervisor_identity'].get(k) for k in IDENTITY_KEYS):
|
||||
raise RuntimeError('MANAGEMENT_CANCELLED: 监督器身份已变化,未提交新的原生调用')
|
||||
_close_probe_dialogs(desktop, owned_pids)
|
||||
|
||||
|
||||
def _require_add_supervisor(job, root):
|
||||
try:
|
||||
_require_management_continuation(job, root)
|
||||
except RuntimeError as error:
|
||||
raise RuntimeError(f'NATIVE_ADD_CANCELLED: {error}') from error
|
||||
from .library_lock import _supervisor_alive
|
||||
deadline = job.get('native_add_deadline')
|
||||
if ((Path(root)/'cancel-native-add.signal').exists()
|
||||
@@ -844,8 +736,7 @@ def _probe_add_dialog_impl(app, job, desktop, owned_pids, root, *, library=None)
|
||||
pythoncom.PumpWaitingMessages(); time.sleep(.1)
|
||||
raise TimeoutError(f'原生窗口未出现:{title}')
|
||||
_require_add_supervisor(job, root)
|
||||
from .session_record import dispatch_native
|
||||
dispatch_native(job, lambda: app.OnReusableBlocksEditor())
|
||||
app.OnReusableBlocksEditor()
|
||||
_require_add_supervisor(job, root)
|
||||
editor = await_window('Reusable Blocks')
|
||||
tabs = Desktop(backend='uia').window(handle=editor).descendants(control_type='TabItem')
|
||||
@@ -873,9 +764,6 @@ def _probe_add_dialog_impl(app, job, desktop, owned_pids, root, *, library=None)
|
||||
if not hwnd or win32gui.GetClassName(hwnd) != 'Edit':
|
||||
raise RuntimeError(f'原生新增字段身份不匹配:{control}')
|
||||
_set_probe_field(hwnd, control, value, root)
|
||||
# Changing source/top fields can make Mentor derive a different name.
|
||||
for control, value in fields.items():
|
||||
_set_probe_field(win32gui.GetDlgItem(dialog, control), control, value, root, read_only=True)
|
||||
_write_json(root/'submitted-fields.json', fields)
|
||||
ok = win32gui.GetDlgItem(dialog, 1083)
|
||||
if not ok:
|
||||
@@ -885,20 +773,7 @@ def _probe_add_dialog_impl(app, job, desktop, owned_pids, root, *, library=None)
|
||||
_write_json(root/'native-add-log-baseline.json', log_baseline)
|
||||
observed_failures = {}
|
||||
_require_add_supervisor(job, root)
|
||||
from .session_record import dispatch_native, update_worker_state
|
||||
def submit_add():
|
||||
_require_add_supervisor(job, root) # Registration/journal I/O may have outlived cancellation.
|
||||
job['_native_add_pending'] = True
|
||||
win32gui.PostMessage(ok, win32con.BM_CLICK, 0, 0)
|
||||
from .desktop_worker import register_pending_native_operation
|
||||
writer = register_pending_native_operation(job, owned_pids)
|
||||
job['_native_add_writer'] = writer
|
||||
try:
|
||||
dispatch_native(job, submit_add, asynchronous=True, required=True)
|
||||
except Exception:
|
||||
if not job.get('_native_add_pending'):
|
||||
writer.complete()
|
||||
raise
|
||||
win32gui.PostMessage(ok, win32con.BM_CLICK, 0, 0)
|
||||
success = None
|
||||
while time.monotonic() < deadline:
|
||||
pythoncom.PumpWaitingMessages()
|
||||
@@ -928,9 +803,6 @@ def _probe_add_dialog_impl(app, job, desktop, owned_pids, root, *, library=None)
|
||||
break
|
||||
if not success:
|
||||
raise TimeoutError('未取得原生新增成功消息;保留副本与私有桌面证据。')
|
||||
job['_native_add_pending'] = False
|
||||
writer.complete()
|
||||
update_worker_state(job, 'POSTCALL')
|
||||
|
||||
|
||||
def run_isolated_probe(source, root, name, *, mentor_home=None, replacement_source=None):
|
||||
@@ -1102,8 +974,6 @@ def _catalog_native(job, root):
|
||||
|
||||
|
||||
def _catalog_com(job, root):
|
||||
if job.get('worker_role') == 'catalog_readonly' and job.get('operation') != 'catalog':
|
||||
raise RuntimeError('WORKER_READONLY_ROLE_MISMATCH')
|
||||
import pythoncom, win32com.client, win32con, win32gui, win32process
|
||||
from .mentor_adapter import _process_details
|
||||
try:
|
||||
@@ -1137,7 +1007,7 @@ def _catalog_com(job, root):
|
||||
win32gui.EnumChildWindows(hwnd, lambda child, _: children.append(child), None)
|
||||
title = win32gui.GetWindowText(hwnd)
|
||||
text = '\n'.join(win32gui.GetWindowText(child) for child in children)
|
||||
if catalog_dialog_action(title, text, read_only=job.get('worker_role') == 'catalog_readonly') == 'cancel':
|
||||
if catalog_dialog_action(title, text) == 'cancel':
|
||||
if hwnd not in observed:
|
||||
observed.append(hwnd)
|
||||
refused.append({'title': title, 'text': text})
|
||||
@@ -1168,16 +1038,10 @@ def _catalog_com(job, root):
|
||||
result = {'success': False, 'safe_to_continue': False}
|
||||
watcher = None
|
||||
try:
|
||||
_require_management_continuation(job, root)
|
||||
from .session_record import dispatch_native, update_worker_state
|
||||
# Keep the launch pending until its exact native identity is recorded.
|
||||
app = dispatch_native(job, lambda: win32com.client.DispatchEx('LibraryManager.Application'),
|
||||
asynchronous=True)
|
||||
app = win32com.client.DispatchEx('LibraryManager.Application')
|
||||
app.Visible = True
|
||||
processes = _process_details('LibraryManager.exe')
|
||||
owned_pids.update(int(p[0]) for p in processes)
|
||||
from .session_record import update_worker_state
|
||||
update_worker_state(job, 'POSTCALL', identities=[('native', pid) for pid in owned_pids])
|
||||
if len(owned_pids) != 1:
|
||||
raise RuntimeError('无法唯一确认本次 Library Manager 进程。')
|
||||
expected_binary = Path(job['mentor_home'])/'lm/win32/bin/LibraryManager.exe'
|
||||
@@ -1187,16 +1051,12 @@ def _catalog_com(job, root):
|
||||
watcher.start()
|
||||
if job['operation'] in ('probe_create_add', 'probe_create'):
|
||||
target = prepare_probe_library(job, root)
|
||||
_require_management_continuation(job, root)
|
||||
library = dispatch_native(job, lambda: app.CreateLibrary(str(target), 1), asynchronous=True)
|
||||
library = app.CreateLibrary(str(target), 1)
|
||||
_write_json(root.parent/'probe-owner.json', {'library': str(target), 'token': job['probe_token']})
|
||||
else:
|
||||
if job['operation'] == 'probe_readd':
|
||||
validate_probe_readd(job, root)
|
||||
_require_management_continuation(job, root)
|
||||
library = dispatch_native(job, lambda: app.OpenLibrary(str(absolute_preserving_drive(job['library']))),
|
||||
asynchronous=True)
|
||||
update_worker_state(job, 'POSTCALL')
|
||||
library = app.OpenLibrary(str(absolute_preserving_drive(job['library'])))
|
||||
if refused:
|
||||
raise RuntimeError('目录读取需要升级中心库或选择流程;已拒绝,目标未获准自动升级。')
|
||||
if library is None or Path(str(library.FullName)).resolve() != Path(job['library']).resolve():
|
||||
@@ -1205,10 +1065,9 @@ def _catalog_com(job, root):
|
||||
if int(library.FlowType) != 1:
|
||||
raise RuntimeError('Native Add requires the DxDesigner Logical-Physical library flow.')
|
||||
_probe_add_dialog(app, job, desktop, owned_pids, root, library=library)
|
||||
dispatch_native(job, lambda: library.Close(), phase='CLOSING')
|
||||
library.Close()
|
||||
library = None
|
||||
_require_management_continuation(job, root)
|
||||
library = dispatch_native(job, lambda: app.OpenLibrary(str(absolute_preserving_drive(job['library']))))
|
||||
library = app.OpenLibrary(str(absolute_preserving_drive(job['library'])))
|
||||
if (library is None or Path(str(library.FullName)).resolve() != Path(job['library']).resolve()
|
||||
or int(library.FlowType) != 1):
|
||||
raise RuntimeError('Native Add reopen did not confirm the exact library and flow.')
|
||||
@@ -1248,16 +1107,14 @@ def _catalog_com(job, root):
|
||||
result['detail'] = str(error)
|
||||
result['exception'] = _exception_details(error)
|
||||
finally:
|
||||
if library is not None and not job.get('_native_add_pending'):
|
||||
try:
|
||||
dispatch_native(job, lambda: library.Close(), phase='CLOSING')
|
||||
if library is not None:
|
||||
try: library.Close()
|
||||
except Exception as error:
|
||||
result['close_detail'] = str(error)
|
||||
result['close_exception'] = _exception_details(error)
|
||||
library = None
|
||||
if app is not None and not job.get('_native_add_pending'):
|
||||
try:
|
||||
dispatch_native(job, lambda: app.Quit(), phase='CLOSING')
|
||||
if app is not None:
|
||||
try: app.Quit()
|
||||
except Exception as error:
|
||||
result['quit_detail'] = str(error)
|
||||
result['quit_exception'] = _exception_details(error)
|
||||
@@ -1271,44 +1128,16 @@ def _catalog_com(job, root):
|
||||
return result
|
||||
|
||||
|
||||
def catalog_worker_main(request_path):
|
||||
"""A catalog-only entry: never allow this read role to select a write branch."""
|
||||
job = json.loads(Path(request_path).read_text(encoding='utf-8'))
|
||||
if job.get('operation') != 'catalog' or job.get('worker_role') != 'catalog_readonly':
|
||||
raise RuntimeError('WORKER_READONLY_ROLE_MISMATCH')
|
||||
return management_worker_main(request_path, catalog_readonly=True)
|
||||
|
||||
|
||||
def management_worker_main(request_path, *, catalog_readonly=False):
|
||||
def management_worker_main(request_path):
|
||||
"""Internal worker. Desktop identity and capability gates are rechecked here."""
|
||||
request_path = Path(request_path)
|
||||
root = request_path.parent
|
||||
job = json.loads(request_path.read_text(encoding='utf-8'))
|
||||
if job.get('worker_role') == 'catalog_readonly' and not catalog_readonly:
|
||||
raise RuntimeError('WORKER_READONLY_ROLE_MISMATCH')
|
||||
if catalog_readonly and (job.get('operation') != 'catalog' or job.get('worker_role') != 'catalog_readonly'):
|
||||
raise RuntimeError('WORKER_READONLY_ROLE_MISMATCH')
|
||||
result = {'success': False, 'safe_to_continue': True}
|
||||
try:
|
||||
_, desktop = _current_desktop()
|
||||
if desktop != job['desktop'] or not desktop.startswith('CbbManagement_'):
|
||||
raise RuntimeError('原生管理操作仅允许在本次私有桌面执行。')
|
||||
_require_management_continuation(job, root)
|
||||
if job.get('cancel_signal'):
|
||||
from .session_record import update_worker_state
|
||||
update_worker_state(job, 'PRECALL')
|
||||
from .desktop_worker import start_supervisor_watchdog
|
||||
start_supervisor_watchdog(job['supervisor_pid'], cancel_path=job['cancel_signal'],
|
||||
supervisor_identity=job.get('supervisor_identity'),
|
||||
session_record_path=job.get('session_record_path'), operation_id=job.get('operation_id'))
|
||||
if job.get('start_gate'):
|
||||
deadline = time.monotonic() + 30
|
||||
while not Path(job['start_gate']).is_file():
|
||||
_require_management_continuation(job, root)
|
||||
if time.monotonic() >= deadline:
|
||||
raise RuntimeError('MANAGEMENT_CANCELLED: 启动门未放行,未启动原生操作')
|
||||
time.sleep(.05)
|
||||
_require_management_continuation(job, root)
|
||||
if job.get('mapped_drive') and job.get('mapped_remote_root'):
|
||||
from .network_path import ensure_mapped_drive_visible
|
||||
ensure_mapped_drive_visible(job['mapped_drive'], job['mapped_remote_root'])
|
||||
@@ -1336,39 +1165,24 @@ def management_worker_main(request_path, *, catalog_readonly=False):
|
||||
command = [str(adapter.home/'lm/win32/bin/CleanWGLib.exe'), str(job['library']), 'F4', str(input_path)]
|
||||
_write_json(root/'command.json', command)
|
||||
with (root/'native-output.txt').open('wb') as output:
|
||||
_require_management_continuation(job, root)
|
||||
from .session_record import dispatch_native, update_worker_state
|
||||
result['safe_to_continue'] = False
|
||||
try:
|
||||
process = dispatch_native(job, lambda: subprocess.Popen(command, stdout=output,
|
||||
stderr=subprocess.STDOUT, creationflags=subprocess.CREATE_NO_WINDOW), asynchronous=True)
|
||||
process = subprocess.Popen(command, stdout=output, stderr=subprocess.STDOUT,
|
||||
creationflags=subprocess.CREATE_NO_WINDOW)
|
||||
except (FileNotFoundError, PermissionError):
|
||||
result['safe_to_continue'] = True
|
||||
raise
|
||||
from .desktop_worker import register_native_writer
|
||||
register_native_writer(process)
|
||||
update_worker_state(job, 'NATIVE_CALL', identities=[('native', process.pid)], continuation=True)
|
||||
try:
|
||||
_write_json(root/'native-process.json', {'pid': process.pid, 'command': command})
|
||||
except OSError:
|
||||
pass # Keep supervising the native owner even when evidence storage fails.
|
||||
_write_json(root/'native-process.json', {'pid': process.pid, 'command': command})
|
||||
# Never terminate this native database owner on timeout.
|
||||
try:
|
||||
code = process.wait(timeout=float(job['timeout_seconds']))
|
||||
except subprocess.TimeoutExpired:
|
||||
result.update(detail=f'TIMEOUT: CleanWGLib PID {process.pid} 尚未释放')
|
||||
while True:
|
||||
try:
|
||||
code = process.wait(timeout=1)
|
||||
break
|
||||
except subprocess.TimeoutExpired:
|
||||
continue
|
||||
result['wait_exceeded'] = True
|
||||
update_worker_state(job, 'POSTCALL')
|
||||
result.update(safe_to_continue=True, exit_code=code)
|
||||
text = (root/'native-output.txt').read_bytes().decode('mbcs', errors='replace')
|
||||
result.update(success=removal_output_ok(code, text, job['name'], job['partition']),
|
||||
detail=text)
|
||||
else:
|
||||
result.update(safe_to_continue=True, exit_code=code)
|
||||
text = (root/'native-output.txt').read_bytes().decode('mbcs', errors='replace')
|
||||
result.update(success=removal_output_ok(code, text, job['name'], job['partition']),
|
||||
detail=text)
|
||||
else:
|
||||
raise ValueError('未验证的原生管理操作')
|
||||
except Exception as error:
|
||||
@@ -1377,8 +1191,5 @@ def management_worker_main(request_path, *, catalog_readonly=False):
|
||||
result['detail'] = str(error)
|
||||
result['exception'] = _exception_details(error)
|
||||
finally:
|
||||
from .session_record import update_worker_state
|
||||
_write_json(root/'result.json', result)
|
||||
# FINISHED permits the orphan watchdog to exit immediately.
|
||||
update_worker_state(job, 'FINISHED' if result.get('safe_to_continue') is True else 'UNCONFIRMED')
|
||||
return 0 if result['success'] and result['safe_to_continue'] else 2
|
||||
@@ -124,7 +124,7 @@ def backup_project(target, destination):
|
||||
handle.Close()
|
||||
|
||||
|
||||
def attempt_recovery(request, diagnosis, evidence_root, *, progress=None, stop=None):
|
||||
def attempt_recovery(request, diagnosis, evidence_root, *, progress=None):
|
||||
root = Path(evidence_root)/'native-repair'
|
||||
root.mkdir(exist_ok=True)
|
||||
marker = root/'attempt.json'
|
||||
@@ -152,7 +152,7 @@ def attempt_recovery(request, diagnosis, evidence_root, *, progress=None, stop=N
|
||||
raise ValueError('REPAIR_DATABASE_IN_USE: 目标的保存/关闭助手尚未退出')
|
||||
callback = (lambda event: progress({'block': request.block_name, **event})) if progress else None
|
||||
record = run_native_repair(target, root, mentor_bin=request.mentor_bin,
|
||||
timeout_seconds=max(60, request.timeout_seconds), progress=callback, stop=stop)
|
||||
timeout_seconds=max(60, request.timeout_seconds), progress=callback)
|
||||
native_status = record.get('status')
|
||||
record['release'] = repair_release_state(request, target, record)
|
||||
if native_status == 'REPAIRED' and record['release']['safe_to_continue'] is not True:
|
||||
@@ -264,44 +264,21 @@ def run_native_repair(target, root, *, mentor_bin='', timeout_seconds=300, progr
|
||||
job_path = root/'repair-request.json'
|
||||
cancel = root/'cancel-repair.signal'
|
||||
desktop = 'CbbRepair_'+uuid4().hex[:12]
|
||||
from .operation_queue import current_context
|
||||
context = current_context()
|
||||
library = (maintenance_context or {}).get('library') or (context.library if context else str(target.project))
|
||||
job = {'project': str(target.project), 'database': str(target.database),
|
||||
job_path.write_text(json.dumps({'project': str(target.project), 'database': str(target.database),
|
||||
'root': str(root), 'mentor_bin': str(mentor_bin or ''), 'timeout': timeout_seconds,
|
||||
'cancel_signal': str(cancel), 'supervisor_pid': os.getpid(), 'desktop': desktop,
|
||||
'maintenance_context': maintenance_context, 'inspection_only': inspection_only,
|
||||
'library': library, 'operation_id': root.name+'-'+uuid4().hex[:8],
|
||||
'operation': 'inspect' if inspection_only else 'repair',
|
||||
'block': (maintenance_context or {}).get('block'),
|
||||
'session_record_path': str(root/'session.json'), 'start_gate': str(root/'start-repair.signal')}
|
||||
job['start_gate_protocol'] = 'event-v1'
|
||||
job_path.write_text(json.dumps(job, ensure_ascii=False), encoding='utf-8')
|
||||
'maintenance_context': maintenance_context, 'inspection_only': inspection_only},
|
||||
ensure_ascii=False), encoding='utf-8')
|
||||
command = ([sys.executable] if getattr(sys, 'frozen', False) else
|
||||
[sys.executable, '-m', 'cbb_refresh_verify']) + ['--repair-worker', str(job_path)]
|
||||
from .operation_queue import task_stop
|
||||
return _supervise_repair(command, desktop, cancel, root, timeout_seconds, progress, task_stop(stop), job)
|
||||
|
||||
|
||||
def _supervise_repair(command, desktop, cancel, root, timeout_seconds, progress, stop, job):
|
||||
from .desktop_worker import DesktopWorker
|
||||
worker = DesktopWorker(command, desktop)
|
||||
worker.bind_cancellation(cancel)
|
||||
from .operation_queue import check_active, native_channel, commit_worker_start
|
||||
native = native_channel(inspection_only=job.get('inspection_only') is True)
|
||||
entered = False
|
||||
# Worker admission includes filesystem/ownership checks before the native
|
||||
# timeout begins. Bound that preparation separately; never extend on polls.
|
||||
deadline = time.monotonic()+60+max(1, float(timeout_seconds))+5
|
||||
event_count = 0
|
||||
cancelled = False
|
||||
try:
|
||||
if hasattr(worker, 'bind_session'):
|
||||
worker.bind_session(job)
|
||||
check_active()
|
||||
native.__enter__()
|
||||
entered = True
|
||||
commit_worker_start(worker, job)
|
||||
while worker.poll() is None and time.monotonic()<deadline:
|
||||
if not cancelled and stop is not None and stop.is_set():
|
||||
worker.request_stop()
|
||||
@@ -317,9 +294,6 @@ def _supervise_repair(command, desktop, cancel, root, timeout_seconds, progress,
|
||||
break
|
||||
event_count += 1
|
||||
time.sleep(.2)
|
||||
if worker.poll() is not None:
|
||||
native.__exit__(None, None, None)
|
||||
entered = False
|
||||
outcome = root/'repair-result.json'
|
||||
if worker.poll() is None or not outcome.is_file():
|
||||
worker.request_stop()
|
||||
@@ -332,17 +306,5 @@ def _supervise_repair(command, desktop, cancel, root, timeout_seconds, progress,
|
||||
if worker.returncode != 0 and result.get('status') in ('REPAIRED', 'NOT_IN_USE', 'IN_USE'):
|
||||
result['status'] = 'UNCONFIRMED'
|
||||
return {**result, 'evidence_path': str(root)}
|
||||
except BaseException:
|
||||
worker.request_stop()
|
||||
raise
|
||||
finally:
|
||||
try:
|
||||
if entered:
|
||||
native.__exit__(None, None, None)
|
||||
if worker.poll() is None and getattr(worker, 'session_record_path', None):
|
||||
from .session_record import handoff_session
|
||||
from .operation_queue import hold_native_handoff
|
||||
handoff_session(worker.session_record_path, evidence_root=root, process=worker)
|
||||
hold_native_handoff(worker, worker.session_record_path)
|
||||
finally:
|
||||
worker.close()
|
||||
worker.close()
|
||||
@@ -192,10 +192,6 @@ def _inspect_project(job, process, emit):
|
||||
result = {'status': 'UNCONFIRMED', 'project': str(project), 'database': str(database),
|
||||
'native_pid': process.pid, 'inspection_only': True, 'repair_requested': False,
|
||||
'repair_required': False, 'output': ''}
|
||||
if getattr(process, '_handle', None) is not None:
|
||||
from .residual_sessions import _handle_identity, _force_ownership
|
||||
result['native_identity'] = dict(pid=process.pid,
|
||||
**_handle_identity(process._handle), **_force_ownership(process._handle, process.pid))
|
||||
deadline = time.monotonic() + max(1, float(job['timeout']))
|
||||
closing = False
|
||||
last_state = None
|
||||
@@ -339,8 +335,6 @@ def repair_worker_main(job_path):
|
||||
if Path(job['cancel_signal']).exists():
|
||||
raise ValueError('REPAIR_CANCELLED_BEFORE_LAUNCH')
|
||||
process = subprocess.Popen([str(executable), '-p', str(project)], cwd=str(project.parent))
|
||||
from .desktop_worker import register_native_writer
|
||||
register_native_writer(process)
|
||||
result['native_started'] = True
|
||||
result['native_pid'] = process.pid
|
||||
emit(stage='native_started', pid=process.pid, project=str(project))
|
||||
|
||||
@@ -1,117 +0,0 @@
|
||||
"""Facts from one helper invocation; process exit is not a Save result."""
|
||||
from collections.abc import Sequence
|
||||
|
||||
|
||||
def recheck_failed_release(library, block, result, *, stop=None, timeout_seconds=10):
|
||||
"""Refresh resource facts after a late exit; keep the original business failure."""
|
||||
if result.safe_to_continue or not result.evidence_path:
|
||||
return result
|
||||
from .operation_queue import BatchTaskContext, TaskHandoff, current_context, task_stop
|
||||
if current_context() is None:
|
||||
context = BatchTaskContext(library=str(library), targets=(block,))
|
||||
try:
|
||||
return context.run(lambda: recheck_failed_release(library, block, result, stop=stop),
|
||||
stop=stop, timeout_seconds=timeout_seconds)
|
||||
except TaskHandoff:
|
||||
return result
|
||||
stop = task_stop(stop)
|
||||
from pathlib import Path
|
||||
from dataclasses import replace
|
||||
import json
|
||||
from .session_record import read_session_record, inspect_session_record
|
||||
from .library_lock import release_retained_library
|
||||
evidence = Path(result.evidence_path)
|
||||
try:
|
||||
session = Path(getattr(result, 'session_record_path', None) or evidence.with_name('session.json'))
|
||||
if session.is_file():
|
||||
record = read_session_record(session, evidence_root=evidence.parent)
|
||||
if record.get('block') != block or Path(record.get('library', '')).resolve() != Path(library).resolve():
|
||||
return result
|
||||
if inspect_session_record(session, evidence_root=evidence.parent).get('status') == 'ACTIVE':
|
||||
return result
|
||||
else:
|
||||
record = json.loads(evidence.read_text('utf-8'))
|
||||
if (record.get('name') != block or record.get('operation') not in ('add', 'update', 'remove')
|
||||
or Path(record.get('library', '')).resolve() != Path(library).resolve()):
|
||||
return result
|
||||
bound = []
|
||||
for phase in ('before', 'remove', 'after-remove', 'add', 'after-add'):
|
||||
candidate = evidence.parent/phase/'session.json'
|
||||
if candidate.is_file():
|
||||
owned = read_session_record(candidate, evidence_root=evidence.parent)
|
||||
if Path(owned.get('library', '')).resolve() != Path(library).resolve():
|
||||
return result
|
||||
if inspect_session_record(candidate, evidence_root=evidence.parent).get('status') == 'ACTIVE':
|
||||
return result
|
||||
bound.append(candidate)
|
||||
if not bound:
|
||||
return result # A generic timeout without a bound owner is not an exit fact.
|
||||
from .operation_queue import check_active
|
||||
check_active()
|
||||
proof = release_retained_library(library, evidence.parent/'late-release', block_name=block, stop=stop)
|
||||
scope = proof.get('resource_scope')
|
||||
if (proof.get('status') != 'RELEASE_CONFIRMED' or proof.get('lease_state') != 'RELEASED'
|
||||
or not isinstance(scope, dict) or scope.get('scope_state') != 'OBSERVED'
|
||||
or proof.get('blocked_resources') != []
|
||||
or Path(proof.get('library', '')).resolve() != Path(library).resolve()):
|
||||
return result
|
||||
check_active()
|
||||
evidence.with_name('late-release-result.json').write_text(json.dumps(dict(
|
||||
business_status=result.status, safe_to_continue=True, release_proof=proof),
|
||||
ensure_ascii=False, default=str, indent=2), 'utf-8')
|
||||
return replace(result, safe_to_continue=True, release_proof=proof)
|
||||
except Exception:
|
||||
return result
|
||||
|
||||
|
||||
def classify_save_state(markers: Sequence[str], *, helper_exited: bool | None,
|
||||
native_released: bool | None, forced: bool = False) -> dict:
|
||||
names = {line.strip().split('|', 1)[0] for line in markers}
|
||||
save_results = names & {'SAVE_OK', 'SAVE_REJECTED', 'SAVE_RESULT_UNKNOWN',
|
||||
'CANCELLED_BEFORE_SAVE'}
|
||||
conflicting_save = (len(save_results) > 1 or
|
||||
('CANCELLED_BEFORE_SAVE' in names and 'SAVE_START' in names))
|
||||
conflicting_close = {'CLOSE_OK', 'CLOSE_FAILED'} <= names
|
||||
save_state = 'UNKNOWN'
|
||||
if not conflicting_save:
|
||||
for marker, state in (('SAVE_OK', 'COMMITTED'), ('SAVE_REJECTED', 'REJECTED'),
|
||||
('CANCELLED_BEFORE_SAVE', 'NOT_STARTED')):
|
||||
if marker in names:
|
||||
save_state = state
|
||||
close_state = 'UNKNOWN'
|
||||
if not conflicting_close:
|
||||
if 'CLOSE_OK' in names:
|
||||
close_state = 'CLOSED'
|
||||
elif 'CLOSE_FAILED' in names:
|
||||
close_state = 'FAILED'
|
||||
resource_state = ('RELEASED' if native_released is True and helper_exited is True else
|
||||
'RETAINED' if native_released is False or helper_exited is False else
|
||||
'UNKNOWN')
|
||||
reasons = []
|
||||
if conflicting_save or conflicting_close:
|
||||
reasons.append('本轮返回标记矛盾')
|
||||
if save_state == 'UNKNOWN':
|
||||
reasons.append('保存返回结果无法确认')
|
||||
if close_state == 'FAILED':
|
||||
reasons.append('原生关闭失败')
|
||||
if 'POST_SAVE_FAILED' in names:
|
||||
reasons.append('保存后核对失败')
|
||||
if forced:
|
||||
reasons.append('会话被中断,退出不代表保存完成')
|
||||
interrupted = (forced or conflicting_save or conflicting_close or
|
||||
'SAVE_RESULT_UNKNOWN' in names or
|
||||
(helper_exited is True and 'SAVE_START' in names and save_state == 'UNKNOWN'))
|
||||
return dict(save_state=save_state, close_state=close_state,
|
||||
helper_state='EXITED' if helper_exited is True else
|
||||
'RUNNING' if helper_exited is False else 'UNKNOWN',
|
||||
resource_state=resource_state, interrupted=interrupted,
|
||||
detail=';'.join(reasons))
|
||||
|
||||
|
||||
def stop_disposition(*, call_started: bool | None, call_returned: bool | None,
|
||||
identity_confirmed: bool) -> str:
|
||||
if not identity_confirmed or call_started is None:
|
||||
return 'OBSERVE_UNCONFIRMED'
|
||||
if call_started is False:
|
||||
return 'CANCEL_BEFORE_CALL' if call_returned is False else 'OBSERVE_UNCONFIRMED'
|
||||
return 'CLEANUP_RETURNED' if call_returned is True else 'WAIT_FOR_RETURN'
|
||||
@@ -1,462 +1,44 @@
|
||||
"""Cooperative FIFO admission for this application's native operations."""
|
||||
from contextlib import contextmanager
|
||||
from dataclasses import dataclass, field
|
||||
import ntpath
|
||||
from threading import Condition, Event, RLock, Thread, local
|
||||
import time
|
||||
from uuid import uuid4
|
||||
from threading import Condition
|
||||
|
||||
|
||||
class QueueCancelled(RuntimeError):
|
||||
pass
|
||||
|
||||
|
||||
class TaskHandoff(QueueCancelled):
|
||||
"""The call is still observable; this is never a release receipt."""
|
||||
def __init__(self, context, *, cancelled=False, result=None):
|
||||
self.operation_id = context.operation_id
|
||||
self.library = context.library
|
||||
self.cancelled = cancelled
|
||||
self.scope = context.scope
|
||||
self.result = result
|
||||
super().__init__('已交给后台观察;当前资源尚未确认释放。')
|
||||
|
||||
|
||||
class _StopSignal:
|
||||
def __init__(self):
|
||||
self._event = Event()
|
||||
|
||||
def set(self):
|
||||
with _tasks_guard:
|
||||
self._event.set()
|
||||
|
||||
def is_set(self):
|
||||
return self._event.is_set()
|
||||
|
||||
def wait(self, timeout=None):
|
||||
return self._event.wait(timeout)
|
||||
|
||||
|
||||
_local = local()
|
||||
_tasks_guard = RLock()
|
||||
_calls = {}
|
||||
|
||||
|
||||
def _path_key(path):
|
||||
# Identity was bound by the caller; queue predicates must never resolve a share.
|
||||
return ntpath.normcase(ntpath.normpath(str(path)))
|
||||
|
||||
|
||||
def request_library_keys(request, context=None):
|
||||
library = str(getattr(request, 'lmc_file', getattr(request, 'library', '__injected_verifier_scope__')))
|
||||
keys = {_path_key(library)}
|
||||
drive, remote = getattr(request, 'mapped_drive', ''), getattr(request, 'mapped_remote_root', '')
|
||||
if drive and remote and ntpath.splitdrive(library)[0].casefold() == drive.rstrip('\\/').casefold():
|
||||
keys.add(_path_key(ntpath.join(remote, ntpath.splitdrive(library)[1].lstrip('\\/'))))
|
||||
if context is not None:
|
||||
aliases = {_path_key(v) for v in (context.library, *context.aliases)}
|
||||
if keys.intersection(aliases):
|
||||
keys.update(aliases)
|
||||
return keys
|
||||
|
||||
|
||||
@dataclass(eq=False)
|
||||
class _Call:
|
||||
context: object
|
||||
external_stop: object = None
|
||||
metadata_only: bool = False
|
||||
done: Event = field(default_factory=Event)
|
||||
abandoned: bool = False
|
||||
native_depth: int = 0
|
||||
commit_depth: int = 0
|
||||
readonly_depth: int = 0
|
||||
supervised_depth: int = 0
|
||||
worker_sessions: list = field(default_factory=list)
|
||||
shutdown_handoff: bool = False
|
||||
native_handoff: str = ''
|
||||
handoff_cancelled: bool = False
|
||||
phase_started: float = field(default_factory=time.monotonic)
|
||||
result: object = None
|
||||
last_result: object = None
|
||||
error: BaseException | None = None
|
||||
|
||||
def is_set(self):
|
||||
return (self.abandoned or self.context.stop.is_set()
|
||||
or self.external_stop is not None and self.external_stop.is_set())
|
||||
|
||||
|
||||
def current_context():
|
||||
call = getattr(_local, 'call', None)
|
||||
return call.context if call is not None else None
|
||||
|
||||
|
||||
def task_stop(fallback=None):
|
||||
return getattr(_local, 'call', None) or fallback
|
||||
|
||||
|
||||
def check_active():
|
||||
call = getattr(_local, 'call', None)
|
||||
if call is not None and call.is_set():
|
||||
raise QueueCancelled('任务已取消,未提交新的原生操作。')
|
||||
|
||||
|
||||
def note_metadata_progress():
|
||||
"""Renew inactivity only after completed I/O; never revive an abandoned call."""
|
||||
call = getattr(_local, 'call', None)
|
||||
if call is not None:
|
||||
with _tasks_guard:
|
||||
if not call.native_depth:
|
||||
check_active()
|
||||
call.phase_started = time.monotonic()
|
||||
|
||||
|
||||
def remember_result(result):
|
||||
call = getattr(_local, 'call', None)
|
||||
if call is not None:
|
||||
with _tasks_guard:
|
||||
call.last_result = result
|
||||
return result
|
||||
|
||||
|
||||
def bind_supervised_worker(path, record):
|
||||
"""Called only after the common launcher has durably registered its worker."""
|
||||
call = getattr(_local, 'call', None)
|
||||
if call is not None:
|
||||
with _tasks_guard:
|
||||
call.worker_sessions.append(dict(path=str(path), operation_id=record['operation_id'],
|
||||
processes=record['processes'], worker_lease_handle=record.get('worker_lease_handle'),
|
||||
worker_protection=record.get('worker_protection'), resource_scope=record.get('resource_scope')))
|
||||
|
||||
|
||||
def check_worker_admission(job):
|
||||
check_active()
|
||||
call = getattr(_local, 'call', None)
|
||||
if (call is not None and call.readonly_depth and job.get('inspection_only') is not True
|
||||
and not (job.get('operation') == 'catalog' and job.get('worker_role') == 'catalog_readonly')):
|
||||
raise RuntimeError('NATIVE_ROLE_REQUIRED: 只读观察不能启动原生写入进程。')
|
||||
|
||||
|
||||
def commit_worker_start(worker, job):
|
||||
"""Prepare evidence outside the shutdown fence; only SetEvent grants admission."""
|
||||
from pathlib import Path
|
||||
import win32event
|
||||
try:
|
||||
check_worker_admission(job)
|
||||
event = getattr(worker, '_start_event', None)
|
||||
context = current_context()
|
||||
if context is not None and context.native_policy == 'external' and event is None:
|
||||
raise RuntimeError('WORKER_ADMISSION_UNCONFIRMED: 缺少已登记的启动事件。')
|
||||
if event is not None and worker._start_binding != (
|
||||
str(job['session_record_path']), job['operation_id'], job['start_gate']):
|
||||
raise RuntimeError('WORKER_ADMISSION_IDENTITY_CHANGED')
|
||||
Path(job['start_gate']).touch()
|
||||
with _tasks_guard:
|
||||
check_worker_admission(job)
|
||||
if event is not None:
|
||||
win32event.SetEvent(event)
|
||||
except BaseException:
|
||||
# A stalled evidence volume cannot delay shutdown or grant admission.
|
||||
if job.get('cancel_signal'):
|
||||
Path(job['cancel_signal']).touch()
|
||||
raise
|
||||
|
||||
|
||||
def hold_native_handoff(process, session_record_path):
|
||||
"""Yield parent admission to controls; the gated worker retains write exclusion.
|
||||
|
||||
The caller registers the exact worker observer first. Its writer barrier and
|
||||
inherited sidecar survive this supervisor, including while a user answers Save.
|
||||
"""
|
||||
call = getattr(_local, 'call', None)
|
||||
if call is not None:
|
||||
with _tasks_guard:
|
||||
call.handoff_cancelled = call.is_set()
|
||||
call.native_handoff = str(session_record_path)
|
||||
call.abandoned = True
|
||||
raise TaskHandoff(call.context, cancelled=call.handoff_cancelled, result=call.last_result)
|
||||
|
||||
|
||||
@contextmanager
|
||||
def local_commit():
|
||||
"""Finish an admitted filesystem rename/rollback without native ownership claims."""
|
||||
call = getattr(_local, 'call', None)
|
||||
with _tasks_guard:
|
||||
check_active()
|
||||
if call is not None:
|
||||
if call.metadata_only or call.readonly_depth:
|
||||
raise RuntimeError('Read-only metadata cannot commit filesystem changes')
|
||||
call.commit_depth += 1
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
if call is not None:
|
||||
with _tasks_guard:
|
||||
call.commit_depth -= 1
|
||||
call.phase_started = time.monotonic()
|
||||
|
||||
|
||||
@contextmanager
|
||||
def native_phase(*, read_only=False, supervised=False):
|
||||
"""Never abandon a transaction between native writes (including Remove/Add)."""
|
||||
call = getattr(_local, 'call', None)
|
||||
if call is not None and call.metadata_only:
|
||||
raise RuntimeError('A metadata-only call cannot enter native work')
|
||||
if call is not None:
|
||||
if call.readonly_depth and not read_only:
|
||||
raise RuntimeError('NATIVE_ROLE_REQUIRED: 只读观察不能提交原生写入。')
|
||||
if not read_only and (call.context.native_policy == 'restricted'
|
||||
or call.context.native_policy == 'external' and not supervised):
|
||||
raise RuntimeError('NATIVE_ROLE_REQUIRED: 界面写入必须通过已登记的独立工作进程。')
|
||||
with _tasks_guard:
|
||||
check_active()
|
||||
if call is not None:
|
||||
call.native_depth += 1
|
||||
call.readonly_depth += int(read_only)
|
||||
call.supervised_depth += int(supervised)
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
if call is not None:
|
||||
with _tasks_guard:
|
||||
call.native_depth -= 1
|
||||
call.readonly_depth -= int(read_only)
|
||||
call.supervised_depth -= int(supervised)
|
||||
call.phase_started = time.monotonic()
|
||||
|
||||
|
||||
@contextmanager
|
||||
def native_channel(*, inspection_only=False, read_only=False):
|
||||
"""Shared by Verify, Repair and backup native clients; reentrant per thread."""
|
||||
import win32con, win32event
|
||||
with native_phase(read_only=read_only or inspection_only, supervised=True):
|
||||
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
|
||||
acquired = False
|
||||
try:
|
||||
check_active()
|
||||
acquired = win32event.WaitForSingleObject(mutex, 0) in (
|
||||
win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
|
||||
if not acquired:
|
||||
raise RuntimeError('NATIVE_CHANNEL_BUSY: 另一个原生操作仍在运行。')
|
||||
from .desktop_worker import assert_native_writer_idle
|
||||
if inspection_only is not True:
|
||||
assert_native_writer_idle()
|
||||
yield
|
||||
finally:
|
||||
if acquired:
|
||||
win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class BatchTaskContext:
|
||||
library: str
|
||||
aliases: tuple[str, ...] = ()
|
||||
targets: tuple[str, ...] = ()
|
||||
resources: tuple[str, ...] = ()
|
||||
operation_id: str = field(default_factory=lambda: uuid4().hex)
|
||||
stop: _StopSignal = field(default_factory=_StopSignal, repr=False, compare=False)
|
||||
_closed: Event = field(default_factory=Event, repr=False, compare=False)
|
||||
native_policy: str = field(default='legacy', kw_only=True)
|
||||
# Only queue/batch boundaries consume this; the current item retains hard-stop semantics.
|
||||
stop_after_current: _StopSignal = field(default_factory=_StopSignal, repr=False, compare=False, kw_only=True)
|
||||
|
||||
def __post_init__(self):
|
||||
if self.native_policy not in ('legacy', 'restricted', 'external'):
|
||||
raise ValueError('Unknown native task role')
|
||||
object.__setattr__(self, 'library', str(self.library))
|
||||
for name in ('aliases', 'targets', 'resources'):
|
||||
object.__setattr__(self, name, tuple(str(v) for v in getattr(self, name)))
|
||||
|
||||
@property
|
||||
def scope(self):
|
||||
return dict(scope_state='DECLARED', library=self.library, aliases=list(self.aliases),
|
||||
block_names=list(self.targets), resources=list(self.resources),
|
||||
operation_ids=[self.operation_id])
|
||||
|
||||
@property
|
||||
def state(self):
|
||||
return self.snapshot()['state']
|
||||
|
||||
def snapshot(self):
|
||||
with _tasks_guard:
|
||||
calls = [call for call in _calls.values() if call.context is self]
|
||||
pending = sum(not call.done.is_set() for call in calls)
|
||||
return dict(operation_id=self.operation_id, resource_scope=self.scope,
|
||||
state='CLOSED' if self._closed.is_set() else
|
||||
'CANCELLED' if self.stop.is_set() else
|
||||
'HANDED_OFF' if any(c.abandoned for c in calls) else
|
||||
'RUNNING' if pending else 'IDLE', pending=pending,
|
||||
pending_native=any(c.native_depth or c.commit_depth for c in calls))
|
||||
|
||||
def shutdown(self):
|
||||
"""Yield UI supervision, never a native worker's write/lease ownership.
|
||||
|
||||
External workers commit their kernel start event under this same fence.
|
||||
Registration and all filesystem preparation remain outside the fence.
|
||||
Legacy in-process transactions cannot opt in.
|
||||
"""
|
||||
with _tasks_guard:
|
||||
self._closed.set()
|
||||
self.cancel()
|
||||
calls = [c for c in _calls.values() if c.context is self and not c.done.is_set()]
|
||||
for call in calls:
|
||||
readonly = call.native_depth and call.readonly_depth == call.native_depth
|
||||
external = (self.native_policy == 'external' and
|
||||
call.supervised_depth == call.native_depth and
|
||||
all(s.get('worker_protection') in ('duplicated_lease', 'worker_owned_lease', 'inspection_only', 'catalog_readonly')
|
||||
for s in call.worker_sessions))
|
||||
if not call.commit_depth and (not call.native_depth or readonly or external):
|
||||
call.shutdown_handoff = call.abandoned = True
|
||||
return {**self.snapshot(), 'safe_to_continue': False,
|
||||
'shutdown_handoff': all(c.shutdown_handoff for c in calls),
|
||||
'worker_sessions': [s for c in calls for s in c.worker_sessions]}
|
||||
|
||||
def cancel(self):
|
||||
self.stop.set()
|
||||
|
||||
def check_active(self):
|
||||
if self.stop.is_set() or self._closed.is_set():
|
||||
raise QueueCancelled('任务已取消,未提交新的原生操作。')
|
||||
check_active()
|
||||
|
||||
def guard_callback(self, callback, *, current=None):
|
||||
call = getattr(_local, 'call', None)
|
||||
def guarded(*args, **kwargs):
|
||||
# Cancellation still gets its own terminal result; closing or an
|
||||
# abandoned invocation cannot update a newer task/library.
|
||||
if (not self._closed.is_set() and not (call and call.abandoned)
|
||||
and (current is None or current() is self)):
|
||||
return callback(*args, **kwargs)
|
||||
return guarded
|
||||
|
||||
def close(self, *, timeout_seconds=30):
|
||||
self._closed.set()
|
||||
self.cancel()
|
||||
deadline = time.monotonic() + min(30, max(0, timeout_seconds))
|
||||
with _tasks_guard:
|
||||
calls = [c for c in _calls.values() if c.context is self]
|
||||
for call in calls:
|
||||
call.done.wait(max(0, deadline-time.monotonic()))
|
||||
with _tasks_guard:
|
||||
for call in calls:
|
||||
if not call.done.is_set() and not call.native_depth and not call.commit_depth:
|
||||
call.abandoned = True
|
||||
return self.snapshot()
|
||||
|
||||
def run(self, action, *, stop=None, timeout_seconds=10, metadata_only=False):
|
||||
self.check_active()
|
||||
if current_context() is self:
|
||||
return action() # Preserve nested lease and mutex thread identity.
|
||||
aliases = {_path_key(v) for v in (self.library, *self.aliases)}
|
||||
call = _Call(self, stop, metadata_only=metadata_only)
|
||||
with _tasks_guard:
|
||||
if not metadata_only and self.native_policy != 'restricted' and any(c.abandoned and not c.metadata_only and aliases.intersection(
|
||||
_path_key(v) for v in (c.context.library, *c.context.aliases))
|
||||
for c in _calls.values()):
|
||||
raise TaskHandoff(self)
|
||||
_calls[id(call)] = call
|
||||
def execute():
|
||||
_local.call = call
|
||||
try:
|
||||
check_active()
|
||||
call.result = action()
|
||||
except BaseException as error:
|
||||
call.error = error
|
||||
finally:
|
||||
with _tasks_guard:
|
||||
call.done.set()
|
||||
_calls.pop(id(call), None)
|
||||
del _local.call
|
||||
Thread(target=execute, name='cbb-task-'+self.operation_id[:12], daemon=True).start()
|
||||
while not call.done.wait(.02):
|
||||
with _tasks_guard:
|
||||
if call.shutdown_handoff:
|
||||
raise TaskHandoff(self, cancelled=True, result=call.last_result)
|
||||
if call.native_handoff:
|
||||
cancelled = call.handoff_cancelled
|
||||
call.abandoned = True
|
||||
raise TaskHandoff(self, cancelled=cancelled, result=call.last_result)
|
||||
elapsed = time.monotonic()-call.phase_started
|
||||
if not call.native_depth and not call.commit_depth and (call.abandoned or elapsed >= timeout_seconds):
|
||||
cancelled = call.is_set()
|
||||
call.abandoned = True
|
||||
raise TaskHandoff(self, cancelled=cancelled, result=call.last_result)
|
||||
if call.error is not None:
|
||||
raise call.error
|
||||
return call.result
|
||||
|
||||
|
||||
class NativeQueue:
|
||||
def __init__(self):
|
||||
self.condition = Condition()
|
||||
self.pending = []
|
||||
self.active = False
|
||||
self.closed = False
|
||||
self.contexts = {}
|
||||
|
||||
def wake(self):
|
||||
with self.condition: self.condition.notify_all()
|
||||
|
||||
def close(self, *, timeout_seconds=30):
|
||||
deadline = time.monotonic()+min(30, max(0, timeout_seconds))
|
||||
with self.condition:
|
||||
self.closed = True
|
||||
contexts = tuple(self.contexts.values())
|
||||
for context in contexts:
|
||||
context.cancel()
|
||||
self.condition.notify_all()
|
||||
return tuple(context.close(timeout_seconds=max(0, deadline-time.monotonic()))
|
||||
for context in contexts)
|
||||
|
||||
def run(self, action, *, stop=None, waiting=None, ready=lambda: True, wait_state=None,
|
||||
context=None, timeout_seconds=10):
|
||||
def available_now():
|
||||
if not ready():
|
||||
return False
|
||||
if context is None:
|
||||
return True # Explicit recovery controls must still reach their retained clients.
|
||||
from .session_record import _live_library_available
|
||||
return all(_live_library_available(path) for path in (context.library, *context.aliases))
|
||||
ticket = [object(), False]
|
||||
def run(self, action, *, stop=None, waiting=None, ready=lambda: True):
|
||||
ticket = object()
|
||||
acquired, notified = False, False
|
||||
previous_state = None
|
||||
with self.condition:
|
||||
if self.closed:
|
||||
raise QueueCancelled('队列已关闭,未启动新的操作。')
|
||||
if context is not None:
|
||||
self.contexts[id(context)] = context
|
||||
self.pending.append(ticket)
|
||||
with self.condition: self.pending.append((ticket, ready))
|
||||
try:
|
||||
while not acquired:
|
||||
available = available_now() # Cached predicates only, outside the queue lock.
|
||||
with self.condition:
|
||||
if (self.closed or stop is not None and stop.is_set()
|
||||
or context is not None and (context.stop.is_set() or context.stop_after_current.is_set())):
|
||||
if stop is not None and stop.is_set():
|
||||
raise QueueCancelled('已取消排队,未启动原生操作。')
|
||||
ticket[1] = bool(available)
|
||||
first = next((entry for entry in self.pending if entry[1]), None)
|
||||
first = next((token for token, available in self.pending if available()), None)
|
||||
if not self.active and first is ticket:
|
||||
self.pending = [entry for entry in self.pending if entry[0] is not ticket]
|
||||
self.active = acquired = True
|
||||
else:
|
||||
self.condition.wait(.1)
|
||||
if acquired and not available_now():
|
||||
with self.condition:
|
||||
ticket[1] = self.active = acquired = False
|
||||
self.condition.notify_all()
|
||||
if not acquired and waiting is not None:
|
||||
try:
|
||||
current_state = wait_state() if wait_state is not None else None
|
||||
if not notified or current_state != previous_state:
|
||||
waiting()
|
||||
notified, previous_state = True, current_state
|
||||
except Exception:
|
||||
pass
|
||||
if (stop is not None and stop.is_set()
|
||||
or context is not None and context.stop_after_current.is_set()):
|
||||
if not acquired and not notified and waiting is not None:
|
||||
notified = True
|
||||
try: waiting()
|
||||
except Exception: pass
|
||||
if stop is not None and stop.is_set():
|
||||
raise QueueCancelled('已取消排队,未启动原生操作。')
|
||||
return context.run(action, stop=stop, timeout_seconds=timeout_seconds) if context else action()
|
||||
return action()
|
||||
finally:
|
||||
with self.condition:
|
||||
self.pending = [entry for entry in self.pending if entry is not ticket]
|
||||
self.pending = [entry for entry in self.pending if entry[0] is not ticket]
|
||||
if acquired: self.active = False
|
||||
self.condition.notify_all()
|
||||
@@ -160,3 +160,18 @@ def wait_for_target_document(job, app_provider, *, process_alive, emit=lambda **
|
||||
last_observation = observation
|
||||
sleep(.25)
|
||||
raise PcbBridgeError('PCB_EXITED_BEFORE_COM', 'PCB 在 COM 文档就绪前退出')
|
||||
|
||||
|
||||
def execution_outcome(*, save_complete: bool, pcb_exited: bool,
|
||||
fatal_error: str = '') -> dict[str, object]:
|
||||
if fatal_error:
|
||||
code, _, detail = str(fatal_error).partition(':')
|
||||
return {'status': 'FAIL', 'error_code': code.strip() or 'FATAL_DIALOG',
|
||||
'stderr': detail.strip() or str(fatal_error), 'safe_to_continue': True}
|
||||
if not save_complete:
|
||||
return {'status': 'FAIL', 'error_code': 'SAVE_NOT_CONFIRMED',
|
||||
'stderr': '保存/关闭未完成', 'safe_to_continue': True}
|
||||
if not pcb_exited:
|
||||
return {'status': 'FAIL', 'error_code': 'PCB_EXIT_NOT_CONFIRMED',
|
||||
'stderr': '保存后未确认 PCB 退出', 'safe_to_continue': True}
|
||||
return {'status': 'PASS', 'stdout': 'Project Integration 已同步;保存、关闭和 PCB 退出均已确认。'}
|
||||
@@ -1,198 +0,0 @@
|
||||
"""Explicit user answers to the owned PCB's exact read/write question."""
|
||||
from contextlib import contextmanager, ExitStack
|
||||
from pathlib import Path
|
||||
from threading import Lock
|
||||
import time
|
||||
|
||||
from .post_repair_consent import exact_prompt
|
||||
|
||||
|
||||
def _prompt_identity(snapshot):
|
||||
# UIA adds chrome/reorders controls and omits Win32 caption accelerator marks.
|
||||
return tuple(sorted((c.handle, c.control_id, c.class_name,
|
||||
c.name.replace('&', '') if c.class_name == 'Button' else c.name)
|
||||
for c in snapshot.controls if c.handle and c.handle != snapshot.hwnd))
|
||||
|
||||
|
||||
class OpenChoice:
|
||||
def __init__(self, block, library):
|
||||
self.block, self.library = block, library
|
||||
self.decision = None
|
||||
self.decision_origin = None
|
||||
self._lock = Lock()
|
||||
|
||||
def choose(self, decision, *, origin='user'):
|
||||
if decision not in ('continue', 'skip', 'cancel'):
|
||||
raise ValueError('无效的打开工程选择')
|
||||
with self._lock:
|
||||
if self.decision is None:
|
||||
self.decision = decision
|
||||
self.decision_origin = origin
|
||||
|
||||
|
||||
def validate_owner(job, target_pid, launcher_pid, worker_pid):
|
||||
from .owner_probe import query_process_snapshot
|
||||
from .session_record import process_identity
|
||||
from .mentor_adapter import is_reusable_circuit_pcb
|
||||
rows = {r['pid']: r for r in query_process_snapshot()}
|
||||
target, launcher = rows.get(target_pid), rows.get(launcher_pid)
|
||||
if (not target or not launcher or target['parent'] != launcher_pid or launcher['parent'] != worker_pid
|
||||
or not str(job.get('desktop', '')).startswith('CbbVerify_')
|
||||
or job.get('interactive_input') or job.get('native_lm_verify') or job.get('diagnostic_only')):
|
||||
raise ValueError('PCB_OPEN_OWNER_UNCONFIRMED')
|
||||
for row in (target, launcher):
|
||||
if not is_reusable_circuit_pcb(row['executable'], row['command'], job['pcb']):
|
||||
raise ValueError('PCB_OPEN_TARGET_CHANGED')
|
||||
return {'target': process_identity(target_pid), 'launcher': process_identity(launcher_pid)}
|
||||
|
||||
|
||||
@contextmanager
|
||||
def resource_guard(job, allowed_pids):
|
||||
import hashlib
|
||||
from .file_probe import hold_release_files
|
||||
from .maintenance_entry import maintenance_project_files
|
||||
from .native_repair import RepairTarget, run_native_repair
|
||||
from .native_occupancy import confirmed_inspection
|
||||
from .session_record import IDENTITY_KEYS
|
||||
from .operation_queue import task_stop
|
||||
from .management import _write_json
|
||||
from .owner_probe import query_process_snapshot
|
||||
from .library_lock import _owner_is_blocking
|
||||
from .verify_runner import preflight, VerifyRequest
|
||||
library = Path(job['lmc_file'])
|
||||
project, pcb = preflight(VerifyRequest(library, job['block_name'], Path(job['root'])))
|
||||
if project.resolve() != Path(job['project']).resolve() or pcb.resolve() != Path(job['pcb']).resolve():
|
||||
raise ValueError('PCB_OPEN_PROJECT_CHANGED')
|
||||
roots = (project.parent, library.parent/'SymbolLibs')
|
||||
configs = maintenance_project_files(project, pcb)
|
||||
def binding():
|
||||
return {str(path.resolve()): hashlib.sha256(path.read_bytes()).hexdigest() for path in (pcb, *configs)}
|
||||
original_binding = binding()
|
||||
def check():
|
||||
for row in query_process_snapshot():
|
||||
if row['pid'] not in allowed_pids and _owner_is_blocking(row, library, roots):
|
||||
raise ValueError(f'目标还有其他会话,PID={row["pid"]};未确认读写打开。')
|
||||
check()
|
||||
stop = task_stop(None)
|
||||
with ExitStack() as stack:
|
||||
files = stack.enter_context(hold_release_files(library, roots, stop=stop))
|
||||
inspections = []
|
||||
if files['addresses']:
|
||||
targets = files['inspection_targets']
|
||||
if any(Path(item['project']).resolve() not in {p.resolve() for p in configs} for item in targets):
|
||||
raise ValueError('PCB_OPEN_DATABASE_UNCONFIRMED: 地址未绑定实际工程配置,需人工核对')
|
||||
stack.close() # Native inspection must access the DB; repeat exact proof afterwards.
|
||||
for index, item in enumerate(targets):
|
||||
target = RepairTarget(Path(item['project']), Path(item['database']))
|
||||
evidence = Path(job['root'])/('open-inspection-'+str(index))
|
||||
result = run_native_repair(target, evidence, mentor_bin=job.get('mentor_bin'),
|
||||
timeout_seconds=min(45, float(job.get('timeout', 45))), inspection_only=True, stop=stop)
|
||||
identity = result.get('native_identity') or {}
|
||||
if (not confirmed_inspection(target, result) or result['status'] != 'NOT_IN_USE'
|
||||
or identity.get('pid') != result.get('native_pid')
|
||||
or any(identity.get(key) is None for key in IDENTITY_KEYS)
|
||||
or not identity.get('image') or not identity.get('owner_sid')):
|
||||
raise ValueError('PCB_OPEN_DATABASE_UNCONFIRMED: 原生检查未确认当前数据库未占用')
|
||||
inspections.append(result)
|
||||
current = stack.enter_context(hold_release_files(library, roots, stop=stop))
|
||||
if any(current[key] != files[key] for key in (
|
||||
'exclusive_files', 'binding_files', 'addresses', 'signatures', 'inspection_targets', 'resource_scope')):
|
||||
raise ValueError('PCB_OPEN_RESOURCE_CHANGED: 原生检查期间资源或地址身份变化')
|
||||
if binding() != original_binding:
|
||||
raise ValueError('PCB_OPEN_PROJECT_CHANGED: 原生检查期间工程引用变化')
|
||||
check()
|
||||
_write_json(Path(job['root'])/'pcb-open-resource-proof.json', {
|
||||
'operation_id': job.get('operation_id'), 'library': str(library),
|
||||
'project': str(project), 'pcb': str(pcb), 'binding': original_binding,
|
||||
'exclusive_files': files['exclusive_files'], 'addresses': files['addresses'],
|
||||
'native_inspections': inspections, 'repair_confirmed': False})
|
||||
yield
|
||||
|
||||
|
||||
class OpenController:
|
||||
def __init__(self, job):
|
||||
self.job = job
|
||||
self.choice = None
|
||||
self.original = self.owner = None
|
||||
self.sent = False
|
||||
self.sent_at = 0.0
|
||||
|
||||
def handle(self, snapshot, snapshots, *, target_pid, launcher_pid, worker_pid, show, perform):
|
||||
from .dialog_supervisor import DialogPollResult
|
||||
from .management import _write_json
|
||||
try:
|
||||
if not exact_prompt(snapshot) or snapshot.pid != target_pid or len(snapshots) != 1:
|
||||
raise ValueError('PCB_OPEN_PROMPT_CHANGED')
|
||||
owner = validate_owner(self.job, target_pid, launcher_pid, worker_pid)
|
||||
if self.choice is None:
|
||||
self.owner, self.original = owner, snapshot
|
||||
self.choice = OpenChoice(self.job['block_name'], self.job['lmc_file'])
|
||||
show(self.choice)
|
||||
if (owner != self.owner or snapshot.hwnd != self.original.hwnd
|
||||
or _prompt_identity(snapshot) != _prompt_identity(self.original)):
|
||||
raise ValueError('PCB_OPEN_IDENTITY_CHANGED')
|
||||
if self.sent:
|
||||
if time.monotonic()-self.sent_at < 2:
|
||||
return DialogPollResult(observed_snapshots=tuple(snapshots))
|
||||
raise ValueError('PCB_OPEN_ANSWER_NOT_COMPLETED')
|
||||
if self.choice.decision is None:
|
||||
return DialogPollResult(activity=True, observed_snapshots=tuple(snapshots))
|
||||
control = 6 if self.choice.decision == 'continue' else 7
|
||||
action = {'action': 'user_confirmed_pcb_open', 'channels': ['win32_button_click'],
|
||||
'target': {'control_id': control}, 'desktop': self.job['desktop'],
|
||||
'pid': target_pid, 'owner': owner, 'choice': self.choice.decision}
|
||||
action['decision_origin'] = self.choice.decision_origin
|
||||
def send():
|
||||
_write_json(Path(self.job['root'])/'pcb-open-user-choice.json', dict(
|
||||
choice=self.choice.decision, decision_origin=self.choice.decision_origin,
|
||||
project=self.job['project'], pcb=self.job['pcb'],
|
||||
library=self.job['lmc_file'], owner=owner, snapshot=snapshot.to_record()))
|
||||
self.sent, self.sent_at = True, time.monotonic()
|
||||
return perform(snapshot, action, snapshot.phase)
|
||||
if control == 6:
|
||||
allowed = {target_pid, launcher_pid, worker_pid, self.job.get('supervisor_pid')}
|
||||
with resource_guard(self.job, allowed):
|
||||
pass
|
||||
# Deliberate TOCTOU tradeoff: release probes before Yes so Mentor
|
||||
# can acquire the files without a sharing violation; recheck identity.
|
||||
if validate_owner(self.job, target_pid, launcher_pid, worker_pid) != owner:
|
||||
raise ValueError('PCB_OPEN_IDENTITY_CHANGED')
|
||||
result = send()
|
||||
else:
|
||||
result = send()
|
||||
error = result.error_code
|
||||
if not error and result.accepted_controls != (control,):
|
||||
error = 'PCB_OPEN_ANSWER_FAILED'
|
||||
if not error and control == 7:
|
||||
error = 'PCB_OPEN_SKIPPED' if self.choice.decision == 'skip' else 'USER_CANCELLED'
|
||||
skipped_detail = ('超时默认跳过本项。' if self.choice.decision_origin == 'timeout_default'
|
||||
else '用户跳过本项。')
|
||||
return DialogPollResult(activity=True, action_sent=True, snapshot=snapshot,
|
||||
error_code=error, detail=result.detail or (skipped_detail if control == 7 else ''),
|
||||
accepted_controls=result.accepted_controls, channel=result.channel,
|
||||
action=action['action'], observed_snapshots=tuple(snapshots))
|
||||
except Exception as error:
|
||||
return DialogPollResult(error_code='DATABASE_RECOVERY_REQUIRED', detail=str(error),
|
||||
snapshot=snapshot, observed_snapshots=tuple(snapshots))
|
||||
|
||||
|
||||
def validate_action_window(snapshot, action):
|
||||
from dataclasses import replace
|
||||
import win32gui, win32process
|
||||
from .native_repair_ui import _current_desktop_name
|
||||
from .dialog_models import ControlSnapshot
|
||||
from .session_record import process_identity
|
||||
if (not exact_prompt(snapshot) or action.get('target', {}).get('control_id') not in (6, 7)
|
||||
or snapshot.pid != action.get('pid') or _current_desktop_name() != action.get('desktop')
|
||||
or not str(action.get('desktop', '')).startswith('CbbVerify_')
|
||||
or win32process.GetWindowThreadProcessId(snapshot.hwnd)[1] != snapshot.pid
|
||||
or process_identity(snapshot.pid) != action.get('owner', {}).get('target')):
|
||||
raise ValueError('PCB_OPEN_LIVE_OWNER_CHANGED')
|
||||
children = []
|
||||
win32gui.EnumChildWindows(snapshot.hwnd, lambda h, _: children.append(int(h)), None)
|
||||
controls = tuple(ControlSnapshot(h, win32gui.GetDlgCtrlID(h) & 0xffff,
|
||||
win32gui.GetClassName(h), win32gui.GetWindowText(h), enabled=bool(win32gui.IsWindowEnabled(h))) for h in children)
|
||||
if not exact_prompt(replace(snapshot, controls=controls)) or any(
|
||||
c.handle != next(x.handle for x in snapshot.controls if x.control_id == c.control_id)
|
||||
for c in controls if c.class_name == 'Button'):
|
||||
raise ValueError('PCB_OPEN_LIVE_PROMPT_CHANGED')
|
||||
@@ -13,16 +13,14 @@ class RestoreChoice:
|
||||
self.block, self.library = block, library
|
||||
self.candidates = tuple(dict(c) for c in candidates)
|
||||
self.decision = None
|
||||
self.decision_origin = None
|
||||
self._lock = Lock()
|
||||
|
||||
def choose(self, kind, *, origin='user'):
|
||||
def choose(self, kind):
|
||||
if kind != 'cancel' and not any(c['kind'] == kind and c['enabled'] for c in self.candidates):
|
||||
raise ValueError('Unknown or disabled PCB restoration version')
|
||||
with self._lock:
|
||||
if self.decision is None:
|
||||
self.decision = kind
|
||||
self.decision_origin = origin
|
||||
|
||||
|
||||
def _candidate_key(candidates):
|
||||
@@ -39,11 +37,10 @@ def _choice(snapshot):
|
||||
|
||||
|
||||
class RestoreController:
|
||||
def __init__(self, job, *, user_open=False):
|
||||
def __init__(self, job):
|
||||
from .post_repair_consent import _validate_grant
|
||||
self.job = job
|
||||
self.grant = None if user_open else _validate_grant(job)
|
||||
self.owner = None
|
||||
self.grant = _validate_grant(job)
|
||||
self.prompt = None
|
||||
self.original = None
|
||||
self.selection_sent = self.confirm_sent = self.failed = False
|
||||
@@ -63,20 +60,13 @@ class RestoreController:
|
||||
or snapshot.pid != self.original.pid
|
||||
or _candidate_key(choice['candidates']) != _candidate_key(self.prompt.candidates)):
|
||||
raise ValueError('PCB_VERSION_CANDIDATES_CHANGED')
|
||||
if self.grant is None:
|
||||
from .pcb_open_consent import validate_owner
|
||||
owner = validate_owner(self.job, target_pid, launcher_pid, worker_pid)
|
||||
if self.owner is not None and owner != self.owner:
|
||||
raise ValueError('PCB_VERSION_OWNER_CHANGED')
|
||||
self.owner = owner
|
||||
else:
|
||||
pre = json.loads((Path(self.job['root'])/'post-repair-prelaunch.json').read_text(encoding='utf-8'))
|
||||
if (pre.get('nonce') != self.grant['nonce'] or pre.get('desktop') != self.job['desktop']
|
||||
or pre.get('worker_pid') != worker_pid or pre.get('supervisor_pid') != self.job['supervisor_pid']
|
||||
or pre.get('addresses') != []
|
||||
or not all(consent._same(pre[key], self.grant[key]) for key in ('project', 'pcb', 'library'))):
|
||||
raise ValueError('PCB_VERSION_PRELAUNCH_PROOF_INVALID')
|
||||
consent._validate_current_processes(self.job, pre, target_pid, launcher_pid, worker_pid, companion_pids)
|
||||
pre = json.loads((Path(self.job['root'])/'post-repair-prelaunch.json').read_text(encoding='utf-8'))
|
||||
if (pre.get('nonce') != self.grant['nonce'] or pre.get('desktop') != self.job['desktop']
|
||||
or pre.get('worker_pid') != worker_pid or pre.get('supervisor_pid') != self.job['supervisor_pid']
|
||||
or pre.get('addresses') != []
|
||||
or not all(consent._same(pre[key], self.grant[key]) for key in ('project', 'pcb', 'library'))):
|
||||
raise ValueError('PCB_VERSION_PRELAUNCH_PROOF_INVALID')
|
||||
consent._validate_current_processes(self.job, pre, target_pid, launcher_pid, worker_pid, companion_pids)
|
||||
if self.prompt is None:
|
||||
self.original = snapshot
|
||||
self.prompt = RestoreChoice(self.job['block_name'], self.job['lmc_file'], choice['candidates'])
|
||||
@@ -84,11 +74,7 @@ class RestoreController:
|
||||
if self.prompt.decision is None:
|
||||
return DialogPollResult(activity=True, observed_snapshots=tuple(snapshots))
|
||||
if self.prompt.decision == 'cancel':
|
||||
_write_json(Path(self.job['root'])/'pcb-version-user-choice.json', dict(
|
||||
project=self.job['project'], pcb=self.job['pcb'], choice='cancel',
|
||||
decision_origin=self.prompt.decision_origin, snapshot=snapshot.to_record()))
|
||||
reason = '超时默认取消' if self.prompt.decision_origin == 'timeout_default' else '用户取消'
|
||||
raise ValueError(reason+' PCB 版本选择;未确认恢复,保留原生现场。')
|
||||
raise ValueError('用户取消 PCB 版本选择;未确认恢复,保留原生现场。')
|
||||
selected = next(c for c in choice['candidates'] if c['kind'] == self.prompt.decision)
|
||||
if not selected['enabled']:
|
||||
raise ValueError('PCB_VERSION_DISABLED')
|
||||
@@ -105,14 +91,10 @@ class RestoreController:
|
||||
action = {'action': 'user_selected_pcb_version', 'channels': ['win32_button_click'],
|
||||
'target': {'control_id': control}, 'desktop': self.job['desktop'], 'pid': target_pid,
|
||||
'choice': selected['kind'], 'candidates': list(self.prompt.candidates)}
|
||||
action['decision_origin'] = self.prompt.decision_origin
|
||||
if self.owner is not None:
|
||||
action['owner'] = self.owner
|
||||
self.selection_sent = True
|
||||
self.confirm_sent = confirming
|
||||
self.sent_at = time.monotonic()
|
||||
record = {'project': self.job['project'], 'pcb': self.job['pcb'], 'choice': selected['kind'],
|
||||
'decision_origin': self.prompt.decision_origin,
|
||||
'date': selected['date'], 'historical_restore': True, 'confirm_sent': confirming,
|
||||
'snapshot': snapshot.to_record()}
|
||||
_write_json(Path(self.job['root'])/'pcb-version-user-choice.json', record)
|
||||
@@ -137,10 +119,6 @@ def validate_action_window(snapshot, action):
|
||||
import win32gui, win32process
|
||||
from .native_repair_ui import _current_desktop_name
|
||||
from .dialog_models import ControlSnapshot
|
||||
if action.get('owner') is not None:
|
||||
from .session_record import process_identity
|
||||
if process_identity(snapshot.pid) != action['owner']['target']:
|
||||
raise ValueError('PCB_VERSION_LIVE_PROCESS_CHANGED')
|
||||
if (not str(action.get('desktop', '')).startswith('CbbVerify_')
|
||||
or _current_desktop_name() != action.get('desktop') or snapshot.pid != action.get('pid')
|
||||
or win32process.GetWindowThreadProcessId(snapshot.hwnd)[1] != snapshot.pid
|
||||
|
||||
@@ -12,7 +12,7 @@ def offers_reimport(result):
|
||||
|
||||
|
||||
def run_reimport_recovery(requests, *, previous_evidence, evidence_dir,
|
||||
adapter=None, stop=None, progress=None,version_prompt=None):
|
||||
adapter=None, stop=None, progress=None):
|
||||
from .management import ManagementResult, _write_json, source_project, run_management_batch
|
||||
from .library_lock import release_retained_library
|
||||
requests = tuple(requests)
|
||||
@@ -62,8 +62,7 @@ def run_reimport_recovery(requests, *, previous_evidence, evidence_dir,
|
||||
if cancelled(): return []
|
||||
stage = 'management'
|
||||
save(stage, management_started=True)
|
||||
results = run_management_batch(requests, adapter=adapter, stop=stop, progress=progress,
|
||||
version_prompt=version_prompt)
|
||||
results = run_management_batch(requests, adapter=adapter, stop=stop, progress=progress)
|
||||
save('complete', results=[asdict(result) for result in results],
|
||||
version_review_required=True)
|
||||
return results
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
"""Preview and cooperatively close the exact native sessions a user confirms."""
|
||||
from contextlib import contextmanager
|
||||
import json
|
||||
import hashlib
|
||||
import os
|
||||
from pathlib import Path
|
||||
import re
|
||||
@@ -21,8 +20,6 @@ _FORCE_CLIENT_NAMES = {'expeditionpcb.exe', 'librarymanager.exe', 'viewdraw.exe'
|
||||
|
||||
def force_block_reason(row):
|
||||
"""A library path proves scope, never exclusive ownership of a server."""
|
||||
if row.get('runtime_phase') in ('NATIVE_CALL', 'CLOSING', 'UNCONFIRMED'):
|
||||
return '本工具的保存或原生调用尚未确认返回,请等待或查看原生提示'
|
||||
if row.get('scope_confirmed') is not True:
|
||||
return '进程归属未确认,不允许强制结束'
|
||||
name = str(row.get('name', '')).casefold()
|
||||
@@ -42,8 +39,8 @@ def force_block_reason(row):
|
||||
return ''
|
||||
|
||||
|
||||
def native_activity(name, windows, *, incomplete=None):
|
||||
if incomplete or any(w['class'] == 'UNCONFIRMED' for w in windows):
|
||||
def native_activity(name, windows):
|
||||
if any(w['class'] == 'UNCONFIRMED' for w in windows):
|
||||
return {'status': 'UNCONFIRMED', 'detail': '原生窗口读取不完整'}
|
||||
if any((name.casefold() == 'icdbprojectbackup.exe' and not w['enabled'])
|
||||
or any(c['class'].casefold() == 'msctls_progress32' for c in w['children']) for w in windows):
|
||||
@@ -115,169 +112,26 @@ def _force_ownership(handle, pid):
|
||||
and session == win32ts.ProcessIdToSessionId(os.getpid())}
|
||||
|
||||
|
||||
class _WindowSnapshot(dict):
|
||||
def __init__(self, pids):
|
||||
super().__init__((pid, []) for pid in pids)
|
||||
self.incomplete = {}
|
||||
|
||||
|
||||
def _process_threads(pids):
|
||||
import ctypes
|
||||
from ctypes import wintypes
|
||||
class ThreadEntry(ctypes.Structure):
|
||||
_fields_ = [('size', wintypes.DWORD), ('usage', wintypes.DWORD), ('tid', wintypes.DWORD),
|
||||
('pid', wintypes.DWORD), ('base', wintypes.LONG), ('delta', wintypes.LONG),
|
||||
('flags', wintypes.DWORD)]
|
||||
kernel = ctypes.WinDLL('kernel32', use_last_error=True)
|
||||
kernel.CreateToolhelp32Snapshot.argtypes = [wintypes.DWORD, wintypes.DWORD]
|
||||
kernel.CreateToolhelp32Snapshot.restype = wintypes.HANDLE
|
||||
kernel.CloseHandle.argtypes = [wintypes.HANDLE]
|
||||
for name in ('Thread32First', 'Thread32Next'):
|
||||
function = getattr(kernel, name)
|
||||
function.argtypes = [wintypes.HANDLE, ctypes.POINTER(ThreadEntry)]
|
||||
function.restype = wintypes.BOOL
|
||||
snapshot = kernel.CreateToolhelp32Snapshot(4, 0) # TH32CS_SNAPTHREAD
|
||||
if snapshot == ctypes.c_void_p(-1).value:
|
||||
raise ctypes.WinError(ctypes.get_last_error())
|
||||
result = {pid: [] for pid in pids}
|
||||
try:
|
||||
entry = ThreadEntry(); entry.size = ctypes.sizeof(entry)
|
||||
more = kernel.Thread32First(snapshot, ctypes.byref(entry))
|
||||
while more:
|
||||
if entry.pid in result:
|
||||
result[entry.pid].append(int(entry.tid))
|
||||
entry.size = ctypes.sizeof(entry)
|
||||
more = kernel.Thread32Next(snapshot, ctypes.byref(entry))
|
||||
if ctypes.get_last_error() != 18: # ERROR_NO_MORE_FILES
|
||||
raise ctypes.WinError(ctypes.get_last_error())
|
||||
finally:
|
||||
kernel.CloseHandle(snapshot)
|
||||
return result
|
||||
|
||||
|
||||
def _thread_desktop_name(tid):
|
||||
import ctypes
|
||||
from ctypes import wintypes
|
||||
user = ctypes.WinDLL('user32', use_last_error=True)
|
||||
user.GetThreadDesktop.argtypes = [wintypes.DWORD]
|
||||
user.GetThreadDesktop.restype = wintypes.HANDLE
|
||||
user.GetUserObjectInformationW.argtypes = [wintypes.HANDLE, ctypes.c_int, wintypes.LPVOID,
|
||||
wintypes.DWORD, ctypes.POINTER(wintypes.DWORD)]
|
||||
user.GetUserObjectInformationW.restype = wintypes.BOOL
|
||||
ctypes.set_last_error(0)
|
||||
desktop = user.GetThreadDesktop(tid)
|
||||
if not desktop:
|
||||
if error := ctypes.get_last_error():
|
||||
raise ctypes.WinError(error)
|
||||
return None # A non-GUI thread need not have an assigned desktop.
|
||||
# GetThreadDesktop returns a borrowed handle; never CloseDesktop it.
|
||||
name, needed = ctypes.create_unicode_buffer(512), wintypes.DWORD()
|
||||
if not user.GetUserObjectInformationW(desktop, 2, name, ctypes.sizeof(name), ctypes.byref(needed)):
|
||||
raise ctypes.WinError(ctypes.get_last_error())
|
||||
return name.value
|
||||
|
||||
|
||||
def _window_error(snapshot, pid):
|
||||
return getattr(snapshot, 'incomplete', {}).get(pid)
|
||||
|
||||
|
||||
def _desktop_names():
|
||||
import ctypes
|
||||
from ctypes import wintypes
|
||||
user = ctypes.WinDLL('user32', use_last_error=True)
|
||||
callback_type = ctypes.WINFUNCTYPE(wintypes.BOOL, wintypes.LPWSTR, wintypes.LPARAM)
|
||||
user.GetProcessWindowStation.restype = wintypes.HANDLE
|
||||
user.EnumDesktopsW.argtypes = [wintypes.HANDLE, callback_type, wintypes.LPARAM]
|
||||
names = []
|
||||
@callback_type
|
||||
def collect(name, _):
|
||||
names.append(name)
|
||||
return len(names) <= 128
|
||||
ctypes.set_last_error(0)
|
||||
if not user.EnumDesktopsW(user.GetProcessWindowStation(), collect, 0) or len(names) > 128:
|
||||
raise OSError('无法完整枚举当前 Windows 窗口站桌面')
|
||||
return names
|
||||
|
||||
|
||||
@contextmanager
|
||||
def _window_desktop(name, *, write=False):
|
||||
"""Keep the desktop accessible while reading or messaging its HWNDs."""
|
||||
if not name:
|
||||
yield None
|
||||
return
|
||||
import ctypes
|
||||
from ctypes import wintypes
|
||||
user = ctypes.WinDLL('user32', use_last_error=True)
|
||||
user.OpenDesktopW.argtypes = [wintypes.LPCWSTR, wintypes.DWORD, wintypes.BOOL, wintypes.DWORD]
|
||||
user.OpenDesktopW.restype = wintypes.HANDLE
|
||||
user.CloseDesktop.argtypes = [wintypes.HANDLE]
|
||||
desktop = user.OpenDesktopW(name, 0, False, 1 | (128 if write else 0))
|
||||
if not desktop:
|
||||
raise ctypes.WinError(ctypes.get_last_error())
|
||||
try:
|
||||
# OpenDesktop alone does not map a foreign desktop's HWNDs into this
|
||||
# process. Enumerate while its handle stays open before any ownership
|
||||
# checks or messages; otherwise GetWindowThreadProcessId returns 0.
|
||||
_desktop_windows(desktop)
|
||||
yield desktop
|
||||
finally:
|
||||
user.CloseDesktop(desktop)
|
||||
|
||||
|
||||
def _desktop_windows(desktop):
|
||||
import ctypes
|
||||
from ctypes import wintypes
|
||||
user = ctypes.WinDLL('user32', use_last_error=True)
|
||||
callback_type = ctypes.WINFUNCTYPE(wintypes.BOOL, wintypes.HWND, wintypes.LPARAM)
|
||||
user.EnumDesktopWindows.argtypes = [wintypes.HANDLE, callback_type, wintypes.LPARAM]
|
||||
windows = []
|
||||
@callback_type
|
||||
def collect(hwnd, _):
|
||||
windows.append(int(hwnd))
|
||||
return len(windows) <= 4096
|
||||
ctypes.set_last_error(0)
|
||||
complete = user.EnumDesktopWindows(desktop, collect, 0)
|
||||
error = ctypes.get_last_error()
|
||||
# Windows also returns zero with ERROR_SUCCESS for an empty desktop.
|
||||
if (not complete and (error or windows)) or len(windows) > 4096:
|
||||
raise OSError('无法完整读取原生桌面窗口')
|
||||
return windows
|
||||
|
||||
|
||||
def _post_window_message(window, hwnd, pid, message):
|
||||
import win32gui, win32process
|
||||
with _window_desktop(window.get('desktop', ''), write=True):
|
||||
if win32process.GetWindowThreadProcessId(hwnd)[1] != pid:
|
||||
raise ValueError('窗口归属已变化,未发送请求')
|
||||
win32gui.PostMessage(hwnd, message, 0, 0)
|
||||
|
||||
|
||||
def _process_windows(pids, *, include_hidden_documents=False):
|
||||
result = _WindowSnapshot(pids)
|
||||
if not pids: return result
|
||||
import win32api, win32con, win32gui, win32process
|
||||
def _process_windows(pids):
|
||||
if not pids: return {}
|
||||
import win32api, win32con, win32gui, win32process, win32service
|
||||
from .native_repair_ui import _native_output
|
||||
result = {pid: [] for pid in pids}
|
||||
observed = set()
|
||||
def capture(hwnd, _, *, pid, desktop_name):
|
||||
if win32process.GetWindowThreadProcessId(hwnd)[1] != pid:
|
||||
raise ValueError('窗口所属进程已变化')
|
||||
if hwnd in observed or not win32gui.IsWindowVisible(hwnd):
|
||||
def capture(hwnd, _=None, *, desktop_name='Default'):
|
||||
pid = win32process.GetWindowThreadProcessId(hwnd)[1]
|
||||
if pid not in result or hwnd in observed or not win32gui.IsWindowVisible(hwnd):
|
||||
return
|
||||
if desktop_name is None:
|
||||
raise ValueError('窗口所属桌面无法读取')
|
||||
observed.add(hwnd)
|
||||
children, documents = [], []
|
||||
def child(handle, _):
|
||||
kind = win32gui.GetClassName(handle)
|
||||
if kind == 'MDIClient' and win32gui.GetWindow(handle, win32con.GW_CHILD):
|
||||
documents.append(handle)
|
||||
visible = bool(win32gui.IsWindowVisible(handle))
|
||||
if visible or (include_hidden_documents and kind.casefold().startswith('afx:')
|
||||
and win32gui.GetClassName(win32gui.GetParent(handle)) == 'MDIClient'):
|
||||
if win32gui.IsWindowVisible(handle):
|
||||
children.append({'hwnd': int(handle), 'class': kind,
|
||||
'id': win32gui.GetDlgCtrlID(handle) & 0xffff,
|
||||
'text': win32gui.GetWindowText(handle), 'enabled': bool(win32gui.IsWindowEnabled(handle)),
|
||||
'visible': visible})
|
||||
'text': win32gui.GetWindowText(handle), 'enabled': bool(win32gui.IsWindowEnabled(handle))})
|
||||
win32api.SetLastError(0)
|
||||
win32gui.EnumChildWindows(hwnd, child, None)
|
||||
window = {'hwnd': int(hwnd), 'title': win32gui.GetWindowText(hwnd),
|
||||
@@ -287,51 +141,31 @@ def _process_windows(pids, *, include_hidden_documents=False):
|
||||
if any(c['class'].casefold().startswith('richedit') for c in children):
|
||||
window['output'] = _native_output([window])
|
||||
result[pid].append(window)
|
||||
win32api.SetLastError(0)
|
||||
def incomplete():
|
||||
for pid in result:
|
||||
result[pid].append({'hwnd': 0, 'title': '窗口状态读取不完整', 'class': 'UNCONFIRMED',
|
||||
'enabled': False, 'children': []})
|
||||
try:
|
||||
threads = _process_threads(pids)
|
||||
except Exception as error:
|
||||
result.incomplete = {pid: str(error)[:500] for pid in pids}
|
||||
win32gui.EnumWindows(capture, None)
|
||||
except Exception:
|
||||
incomplete()
|
||||
try:
|
||||
desktops = win32service.GetProcessWindowStation().EnumDesktops()
|
||||
except Exception:
|
||||
incomplete()
|
||||
return result
|
||||
desktops, unresolved = {}, set()
|
||||
for pid in pids:
|
||||
if not threads.get(pid):
|
||||
result.incomplete[pid] = '进程线程已退出或暂时无法读取'
|
||||
for tid in threads.get(pid, ()):
|
||||
try:
|
||||
desktop = _thread_desktop_name(tid)
|
||||
if desktop:
|
||||
desktops.setdefault(desktop, set()).add(pid)
|
||||
except Exception as error:
|
||||
unresolved.add(pid)
|
||||
if pid not in unresolved and not any(pid in members for members in desktops.values()):
|
||||
result.incomplete.setdefault(pid, '窗口所属桌面暂时无法确认')
|
||||
if unresolved:
|
||||
# Native PCB threads can deny GetThreadDesktop even when their named
|
||||
# desktop is readable. Complete a bounded station scan for those PIDs.
|
||||
for name in desktops:
|
||||
if name != 'Default' and not name.startswith(('CbbVerify_', 'CbbRepair_', 'CbbManagement_', 'CbbStatusRead_', 'CbbFlagRead_')):
|
||||
continue
|
||||
desktop = None
|
||||
try:
|
||||
names = _desktop_names()
|
||||
if not names: raise OSError('当前窗口站未返回桌面')
|
||||
for name in names:
|
||||
desktops.setdefault(name, set()).update(unresolved)
|
||||
except Exception as error:
|
||||
for pid in unresolved:
|
||||
result.incomplete.setdefault(pid, str(error)[:500])
|
||||
# Filter by PID before reading window data, including on fallback desktops.
|
||||
for name, members in desktops.items():
|
||||
try:
|
||||
with _window_desktop(name) as desktop:
|
||||
for hwnd in _desktop_windows(desktop):
|
||||
pid = None
|
||||
try:
|
||||
pid = win32process.GetWindowThreadProcessId(hwnd)[1]
|
||||
if pid in members:
|
||||
capture(hwnd, None, pid=pid, desktop_name=name)
|
||||
except Exception as error:
|
||||
for affected in (members if pid is None else {pid} & members):
|
||||
result.incomplete.setdefault(affected, str(error)[:500])
|
||||
except Exception as error:
|
||||
for pid in members:
|
||||
result.incomplete.setdefault(pid, str(error)[:500])
|
||||
desktop = win32service.OpenDesktop(name, 0, False, win32con.DESKTOP_READOBJECTS)
|
||||
for hwnd in desktop.EnumDesktopWindows(): capture(int(hwnd), desktop_name=name)
|
||||
except Exception:
|
||||
incomplete()
|
||||
finally:
|
||||
if desktop is not None: desktop.CloseDesktop()
|
||||
return result
|
||||
|
||||
|
||||
@@ -347,10 +181,8 @@ def _project_name(row, library):
|
||||
return '当前库关联会话'
|
||||
|
||||
|
||||
def close_target(name, windows, *, incomplete=None):
|
||||
def close_target(name, windows):
|
||||
"""No save/restore approval and no close against an unknown modal/window."""
|
||||
if incomplete:
|
||||
return None, '该会话窗口读取不完整,请重新检查:'+str(incomplete)
|
||||
main = [w for w in windows if w['class'].startswith('Afx:') and (
|
||||
name.casefold() == 'icdbprojectbackup.exe' and w['title'].startswith('iCDB Project Backup')
|
||||
or name.casefold() == 'librarymanager.exe' and w['title'].startswith('Library Manager')
|
||||
@@ -380,9 +212,7 @@ def close_target(name, windows, *, incomplete=None):
|
||||
return window, ('将正常关闭工程;未保存时等待确认' if window.get('documents') else '可正常关闭')
|
||||
|
||||
|
||||
def _save_question(windows, *, incomplete=None):
|
||||
if incomplete:
|
||||
return None
|
||||
def _save_question(windows):
|
||||
for window in windows:
|
||||
text = '\n'.join(c['text'] for c in window['children'] if c['class'] == 'Static')
|
||||
buttons = {c['id']: c for c in window['children'] if c['class'] == 'Button' and c['enabled']}
|
||||
@@ -394,9 +224,8 @@ def _save_question(windows, *, incomplete=None):
|
||||
return None
|
||||
|
||||
|
||||
def _cancel_question(name, windows, *, incomplete=None):
|
||||
if (name.casefold() != 'icdbprojectbackup.exe'
|
||||
or native_activity(name, windows, incomplete=incomplete)['status'] != 'ACTIVE'):
|
||||
def _cancel_question(name, windows):
|
||||
if name.casefold() != 'icdbprojectbackup.exe' or native_activity(name, windows)['status'] != 'ACTIVE':
|
||||
return None
|
||||
candidates = []
|
||||
for window in windows:
|
||||
@@ -436,31 +265,23 @@ def inspect_residual_sessions(library, *, block_names=()):
|
||||
if scope is not False:
|
||||
candidates.append({**row, 'scope_confirmed': scope is True})
|
||||
windows = _process_windows({r['pid'] for r in candidates})
|
||||
from .session_record import active_write_records
|
||||
runtime_writes = active_write_records(library)
|
||||
sessions = []
|
||||
for row in candidates:
|
||||
item = dict(row)
|
||||
item['library'] = str(library)
|
||||
if runtime_writes and row['scope_confirmed']:
|
||||
item['runtime_phase'] = runtime_writes[0]['phase']
|
||||
item['block_names'] = list(blocks)
|
||||
error = _window_error(windows, row['pid'])
|
||||
item.update(windows_incomplete=bool(error), window_read_error=error)
|
||||
try:
|
||||
item.update(_process_identity(row))
|
||||
target, detail = close_target(row['name'], windows.get(row['pid'], []), incomplete=error) if row['scope_confirmed'] else (
|
||||
None, '归属未确认,仅作观察;将检查当前库实际占用。')
|
||||
target, detail = close_target(row['name'], windows.get(row['pid'], [])) if row['scope_confirmed'] else (
|
||||
None, '归属未确认,请在原生窗口确认工程并关闭后重新检查')
|
||||
item.update(can_close=target is not None, detail=detail)
|
||||
except Exception as identity_error:
|
||||
item.update(can_close=False, detail=f'进程已变化或暂时无法确认:{identity_error}')
|
||||
except Exception as error:
|
||||
item.update(can_close=False, detail=f'进程已变化或暂时无法确认:{error}')
|
||||
item['project'] = _project_name(row, library) if row['scope_confirmed'] else '归属未确认'
|
||||
item['prompt'] = _save_question(windows.get(row['pid'], []), incomplete=error) if row['scope_confirmed'] else None
|
||||
item['prompt'] = _save_question(windows.get(row['pid'], [])) if row['scope_confirmed'] else None
|
||||
observed = windows.get(row['pid'], [])
|
||||
item['windows'] = observed
|
||||
item['desktops'] = sorted({w.get('desktop', '') for w in observed if w.get('desktop')})
|
||||
item['native_activity'] = native_activity(row['name'], observed, incomplete=error)
|
||||
item['cancel_prompt'] = (_cancel_question(row['name'], observed, incomplete=error)
|
||||
item['native_activity'] = native_activity(row['name'], observed)
|
||||
item['cancel_prompt'] = (_cancel_question(row['name'], observed)
|
||||
if row['scope_confirmed'] and item.get('force_user_confirmed') is True else None)
|
||||
if any(name.startswith('Cbb') for name in item['desktops']) and not item['can_close']:
|
||||
item['detail'] += ';窗口在后台,可查看原生提示并使用已提供的保存/取消操作'
|
||||
@@ -485,405 +306,38 @@ def inspect_residual_sessions(library, *, block_names=()):
|
||||
'previous_records': previous}
|
||||
|
||||
|
||||
def _hidden_tip_owner(tip, pid):
|
||||
"""Read only the Tip's direct hidden frame, never arbitrary hidden windows."""
|
||||
import win32api, win32con, win32gui, win32process
|
||||
with _window_desktop(tip['desktop']) as desktop:
|
||||
hwnd = win32gui.GetWindow(tip['hwnd'], win32con.GW_OWNER)
|
||||
if (not hwnd or hwnd not in _desktop_windows(desktop)
|
||||
or win32process.GetWindowThreadProcessId(hwnd)[1] != pid
|
||||
or win32gui.IsWindowVisible(hwnd) or win32gui.IsWindowEnabled(hwnd)):
|
||||
return None
|
||||
kind, title = win32gui.GetClassName(hwnd), win32gui.GetWindowText(hwnd)
|
||||
if not kind.startswith('Afx:') or title.strip() not in (
|
||||
'Expedition PCB', 'Expedition PCB - Reusable Block'):
|
||||
return None
|
||||
children, documents = [], []
|
||||
def child(control, _):
|
||||
control_class = win32gui.GetClassName(control)
|
||||
if control_class.casefold() == 'msctls_progress32':
|
||||
children.append({'class': control_class})
|
||||
if control_class == 'MDIClient' and win32gui.GetWindow(control, win32con.GW_CHILD):
|
||||
documents.append(control)
|
||||
win32api.SetLastError(0)
|
||||
win32gui.EnumChildWindows(hwnd, child, None)
|
||||
return dict(hwnd=hwnd, title=title, **{'class': kind}, desktop=tip['desktop'],
|
||||
enabled=False, children=children, documents=documents)
|
||||
|
||||
|
||||
def _dismiss_startup_tip(row, handle, windows, *, incomplete=None, dismissed=(), deadline=None, stop=None):
|
||||
"""A non-writing startup Tip may finish an already pending normal close."""
|
||||
import win32con, win32event, win32gui
|
||||
from .failed_session import _startup_snapshot, _tip_target
|
||||
if (incomplete or row.get('scope_confirmed') is not True
|
||||
or row.get('name', '').casefold() != 'expeditionpcb.exe'
|
||||
or row.get('runtime_phase') in ('NATIVE_CALL', 'CLOSING', 'UNCONFIRMED')
|
||||
or native_activity(row['name'], windows)['status'] != 'IDLE'):
|
||||
return None
|
||||
desktops = {w.get('desktop', '') for w in windows}
|
||||
if len(desktops) != 1 or not next(iter(desktops), '').startswith('CbbVerify_'):
|
||||
return None
|
||||
tips = [w for w in windows if w['class'] == '#32770' and w['title'] == 'Tip of the Day']
|
||||
if len(tips) != 1 or tips[0]['hwnd'] in dismissed:
|
||||
return None
|
||||
tip = tips[0]
|
||||
hidden_owner = None
|
||||
if not any(w['class'].startswith('Afx:') for w in windows):
|
||||
hidden_owner = _hidden_tip_owner(tip, row['pid'])
|
||||
# A disabled empty frame is expected behind a modal Tip. No document,
|
||||
# progress, other dialog, or arbitrary disabled application is admitted.
|
||||
rest = [dict(w, enabled=True) if w['class'].startswith('Afx:') else w
|
||||
for w in windows if w is not tip]
|
||||
if hidden_owner is not None:
|
||||
rest.append(dict(hidden_owner, enabled=True))
|
||||
main, _ = close_target(row['name'], rest)
|
||||
if (main is None or main.get('documents')
|
||||
or row.get('startup_frame', main['hwnd']) != main['hwnd']
|
||||
or main['title'].strip() not in (
|
||||
'Expedition PCB', 'Expedition PCB - Reusable Block')):
|
||||
return None
|
||||
buttons = [c for c in tip['children'] if c['class'] == 'Button' and c.get('id') == 1
|
||||
and c.get('enabled')]
|
||||
if len(buttons) != 1 or not tip['enabled']:
|
||||
return None
|
||||
if row.get('library'):
|
||||
from .session_record import active_write_records
|
||||
if active_write_records(row['library']):
|
||||
return None
|
||||
with _window_desktop(tip['desktop'], write=True):
|
||||
if win32gui.GetWindow(tip['hwnd'], win32con.GW_OWNER) != main['hwnd']:
|
||||
return None
|
||||
current = _startup_snapshot(tip['hwnd'], row['pid'])
|
||||
target = _tip_target(current)
|
||||
if (target is None or target.handle != buttons[0]['hwnd']
|
||||
or current.title != tip['title'] or current.window_class != tip['class']):
|
||||
return None
|
||||
fresh = _process_windows({row['pid']})
|
||||
if (_window_error(fresh, row['pid']) or fresh.get(row['pid']) != windows
|
||||
or win32event.WaitForSingleObject(handle, 0) != win32con.WAIT_TIMEOUT
|
||||
or _handle_identity(handle) != {k: row.get(k) for k in ('created_handle', 'image')}
|
||||
or win32gui.GetWindow(tip['hwnd'], win32con.GW_OWNER) != main['hwnd']
|
||||
or hidden_owner is not None and _hidden_tip_owner(tip, row['pid']) != hidden_owner
|
||||
or _startup_snapshot(tip['hwnd'], row['pid']) != current):
|
||||
return None
|
||||
if (deadline is not None and time.monotonic() >= deadline
|
||||
or stop is not None and stop.is_set()):
|
||||
return None
|
||||
_post_window_message(tip, target.handle, row['pid'], win32con.BM_CLICK)
|
||||
return tip['hwnd']
|
||||
|
||||
|
||||
def _cancelled_diagnostic_record(row):
|
||||
"""Existing complete registration can authorize cleanup, never validation."""
|
||||
import stat
|
||||
import pywintypes, win32con, win32event
|
||||
from .session_record import _session, IDENTITY_KEYS, active_write_records
|
||||
from .failed_session import _command_args
|
||||
if row.get('scope_confirmed') is not True or row.get('name', '').casefold() != 'expeditionpcb.exe':
|
||||
return None
|
||||
def same(a, b):
|
||||
return os.path.normcase(os.path.abspath(str(a))) == os.path.normcase(os.path.abspath(str(b)))
|
||||
def read(path, *, lines=False):
|
||||
if path.lstat().st_file_attributes & stat.FILE_ATTRIBUTE_REPARSE_POINT:
|
||||
raise ValueError('STARTUP_RECORD_REPARSE_POINT')
|
||||
with path.open('rb') as stream:
|
||||
data = stream.read(1024*1024+1)
|
||||
if len(data) > 1024*1024:
|
||||
raise ValueError('STARTUP_RECORD_TOO_LARGE')
|
||||
return [json.loads(line) for line in data.splitlines()] if lines else json.loads(data)
|
||||
matches = []
|
||||
for record in row.get('session_records', ()):
|
||||
try:
|
||||
path = Path(record['path']); root = path.parent
|
||||
session, state, identities = _session(path, root)
|
||||
job, result = read(root/'request.json'), read(root/'result.json')
|
||||
operation = session['operation_id']
|
||||
scope = session.get('resource_scope', {})
|
||||
if (record.get('operation_id') != operation or job.get('operation_id') != operation
|
||||
or job.get('diagnostic_only') not in (True,False) or job.get('interactive_input') is not False
|
||||
or job.get('operation') != 'verify' or session.get('operation') != 'verify'
|
||||
or not all(same(value, row['library']) for value in (job['library'], job['lmc_file'], session['library']))
|
||||
or not same(job['root'], root) or not same(job['session_record_path'], path)
|
||||
or job.get('desktop') != session.get('desktop') or not job['desktop'].startswith('CbbVerify_')
|
||||
or scope.get('scope_state') != 'DECLARED' or scope.get('operation_id') != operation
|
||||
or not same(scope.get('library', ''), row['library'])
|
||||
or scope.get('projects') != [job['project']]
|
||||
or not Path(job['pcb']).is_relative_to(Path(job['project']).parent)
|
||||
or not same(job['cancel_signal'], session['cancel_signal'])
|
||||
or Path(job['cancel_signal']).parent != root or not Path(job['cancel_signal']).is_file()
|
||||
or result.get('status') != 'CANCELLED' or result.get('error_stage') != 'PCB_STARTING'
|
||||
or result.get('write_outcome', {}).get('save_state') != 'UNKNOWN'
|
||||
or state.get('phase') != 'UNCONFIRMED' or (root/'save.log').exists()):
|
||||
continue
|
||||
native = [p for p in identities if p.get('role') == 'native' and p['pid'] == row['pid']]
|
||||
workers = [p for p in identities if p.get('role') in ('worker', 'helper')]
|
||||
if (len(native) != 1 or not workers
|
||||
or any(native[0][k] != row.get(k) for k in IDENTITY_KEYS)
|
||||
or any(p.get('role') not in ('worker','helper','native','supervisor') for p in identities)):
|
||||
continue
|
||||
for worker in workers:
|
||||
try:
|
||||
with _process_handle(worker['pid']) as held:
|
||||
if win32event.WaitForSingleObject(held, 0) != win32con.WAIT_OBJECT_0:
|
||||
raise ValueError('STARTUP_WORKER_STILL_ACTIVE')
|
||||
except (OSError, pywintypes.error) as error:
|
||||
if getattr(error, 'winerror', None) != 87:
|
||||
raise
|
||||
args = _command_args(row['command'])
|
||||
if ('-reusablecircuit' not in [a.casefold() for a in args]
|
||||
or not any(same(a, job['pcb']) for a in args[1:])):
|
||||
continue
|
||||
events = read(root/'events.jsonl', lines=True)
|
||||
if (not any(e.get('stage') == 'pcb_worker_started' and e.get('pcb_pid') == row['pid'] for e in events)
|
||||
or not any(e.get('stage') == 'pcb_baseline' and row['pid'] not in e.get('pids', []) for e in events)
|
||||
or any(str(e.get('stage', '')).startswith(('save', 'integration', 'validate', 'failure_close'))
|
||||
or e.get('stage') == 'diagnostic_complete' for e in events)):
|
||||
continue
|
||||
closes = [e for e in events if e.get('stage') in ('startup_close_requested', 'diagnostic_wm_close')]
|
||||
if len(closes) > 1 or any(e.get('pcb_pid') != row['pid'] or not e.get('hwnd') for e in closes):
|
||||
continue
|
||||
if any(r.get('operation_id') != operation for r in active_write_records(row['library'])):
|
||||
continue
|
||||
if job.get('diagnostic_only') is False:
|
||||
from .failed_session import cancelled_prewrite_startup
|
||||
from .diagnostic_open import _load_evidence
|
||||
baseline=cancelled_prewrite_startup(job,row['pid'])
|
||||
if baseline is None or _load_evidence(job,row['pid'],baseline,require_autosave=False) is None:
|
||||
continue
|
||||
matches.append(dict(job=job, record_path=str(path), operation_id=operation,
|
||||
closed_frame=closes[0]['hwnd'] if closes else None,
|
||||
declined_buttons=[e['hwnd'] for e in events if e.get('stage')=='startup_prompt_no'
|
||||
and e.get('pcb_pid')==row['pid'] and e.get('control_id')==7 and e.get('hwnd')],
|
||||
dismissed_tips=[e['hwnd'] for e in events if e.get('stage')=='startup_tip_dismissed'
|
||||
and e.get('pcb_pid')==row['pid'] and e.get('hwnd')]))
|
||||
except (OSError, pywintypes.error, ValueError, KeyError, TypeError):
|
||||
continue
|
||||
return matches[0] if len(matches) == 1 else None
|
||||
|
||||
|
||||
def _legacy_diagnostic_windows(row):
|
||||
"""Adapt the existing complete private-desktop snapshot for diagnostic policy."""
|
||||
import win32con, win32gui
|
||||
snapshot = _process_windows({row['pid']}, include_hidden_documents=True)
|
||||
if _window_error(snapshot, row['pid']):
|
||||
raise ValueError('STARTUP_WINDOW_UNCONFIRMED')
|
||||
result = []
|
||||
for window in snapshot.get(row['pid'], []):
|
||||
if window.get('desktop') != row['cleanup_desktop']:
|
||||
raise ValueError('STARTUP_DESKTOP_UNCONFIRMED')
|
||||
benign = (not window['title'] and window['class'] in ('UAC_InputIndicatorOverlayWnd', 'UAC Input Indicator'))
|
||||
benign = benign or (window['class'] == 'Internet Explorer_Hidden' and not window['title']
|
||||
and not window['children'] and window.get('rect', [1,1,2,2])[:2] == window.get('rect', [1,1,2,2])[2:])
|
||||
if benign:
|
||||
continue
|
||||
with _window_desktop(window['desktop']):
|
||||
children = [dict(c, parent=win32gui.GetParent(c['hwnd'])) for c in window['children']]
|
||||
result.append(dict(hwnd=window['hwnd'], pid=row['pid'], **{'class':window['class']},
|
||||
text=window['title'], enabled=window['enabled'], children=children,
|
||||
owner=int(win32gui.GetWindow(window['hwnd'], win32con.GW_OWNER) or 0)))
|
||||
return result
|
||||
|
||||
|
||||
def _close_registered_startup(row, handle, proof, *, stop=None, deadline=None):
|
||||
import pywintypes, win32con, win32event
|
||||
from .diagnostic_open import cancelled_startup_step
|
||||
from .operation_queue import check_active
|
||||
job = proof['job']; bound = dict(row, cleanup_desktop=job['desktop'])
|
||||
if deadline is None:deadline = time.monotonic()+30
|
||||
def active_owner():
|
||||
check_active()
|
||||
if stop is not None and stop.is_set():
|
||||
return False
|
||||
owner = _force_ownership(handle,row['pid'])
|
||||
return (owner.get('force_user_confirmed') is True
|
||||
and win32event.WaitForSingleObject(handle,0) == win32con.WAIT_TIMEOUT
|
||||
and _handle_identity(handle) == {k:row.get(k) for k in ('created_handle','image')}
|
||||
and all(owner.get(k) == row.get(k) for k in ('owner_sid','session_id')))
|
||||
def confirmed():
|
||||
if not active_owner():return False
|
||||
fresh = next((p for p in query_process_snapshot() if p['pid'] == row['pid']), None)
|
||||
return (fresh is not None and all(fresh.get(k) == row.get(k) for k in ('created','command','executable','name'))
|
||||
and _cancelled_diagnostic_record(row) == proof)
|
||||
def post(hwnd, message):
|
||||
if not active_owner() or time.monotonic() >= deadline:
|
||||
raise ValueError('STARTUP_ACTION_UNCONFIRMED')
|
||||
_post_window_message({'desktop':job['desktop']}, hwnd, row['pid'], message)
|
||||
state = {'clicked':set()}; closed = proof['closed_frame']; dismissed_tips = set(proof.get('dismissed_tips',()))
|
||||
def read_bound_windows():
|
||||
windows=_legacy_diagnostic_windows(bound)
|
||||
for window in windows:
|
||||
if any(c['hwnd'] in proof.get('declined_buttons',()) for c in window['children']):
|
||||
state['clicked'].add(window['hwnd'])
|
||||
return windows
|
||||
try:
|
||||
while time.monotonic() < deadline:
|
||||
if win32event.WaitForSingleObject(handle, 0) == win32con.WAIT_OBJECT_0:
|
||||
return {'release_status':'RELEASED','detail':'已正常结束已取消的诊断启动'}
|
||||
if not active_owner():
|
||||
break
|
||||
snapshot = _process_windows({row['pid']})
|
||||
# Only this fully proved no-write operation may bypass its historical
|
||||
# UNCONFIRMED label; other operations were vetoed by the proof above.
|
||||
tip_row = {k:v for k,v in row.items() if k not in ('runtime_phase','library')}
|
||||
if closed is not None:
|
||||
tip_row['startup_frame'] = closed
|
||||
has_tip = any(w['title'] == 'Tip of the Day' for w in snapshot.get(row['pid'],[]))
|
||||
tip = (_dismiss_startup_tip(tip_row,handle,snapshot.get(row['pid'],[]),
|
||||
incomplete=_window_error(snapshot,row['pid']),dismissed=dismissed_tips,deadline=deadline,stop=stop)
|
||||
if has_tip and confirmed() else None)
|
||||
if tip is not None:
|
||||
dismissed_tips.add(tip)
|
||||
if closed is None:
|
||||
continue # Tip may precede loading; the same intent still owns its one Close.
|
||||
while time.monotonic() < deadline:
|
||||
if win32event.WaitForSingleObject(handle,100) == win32con.WAIT_OBJECT_0:
|
||||
return {'release_status':'RELEASED','detail':'已关闭启动提示并正常退出'}
|
||||
if stop is not None and stop.is_set():break
|
||||
break # Never stack another Close after a legacy Tip acknowledgement.
|
||||
try:
|
||||
closed,_ = cancelled_startup_step(job,row['pid'],state,closed_frame=closed,deadline=deadline,
|
||||
post=post,emit=lambda **event:None,read_windows=read_bound_windows,
|
||||
identity_check=confirmed)
|
||||
except RuntimeError as error:
|
||||
if not str(error).startswith('STARTUP_WINDOW_CHANGED:'):
|
||||
raise
|
||||
# No may remove a modal and enable the target while the next
|
||||
# snapshot is being read. Revalidate anew inside the same budget.
|
||||
time.sleep(.1)
|
||||
except (OSError, pywintypes.error, ValueError, RuntimeError) as error:
|
||||
return {'release_status':'WAITING','detail':str(error)}
|
||||
return {'release_status':'WAITING','detail':'已请求取消启动清理,等待原生退出后重新检查'}
|
||||
|
||||
|
||||
def _ordinary_startup_close(row, handle, proof, *, stop=None):
|
||||
"""One persisted retained phase, serialized with existing explicit release."""
|
||||
import win32con, win32event
|
||||
from .session_record import read_session_record, write_session_record
|
||||
from .operation_queue import native_phase
|
||||
waiting = {'release_status':'WAITING','detail':'取消启动清理已交接或原生执行通道忙,继续观察'}
|
||||
mutex=win32event.CreateMutex(None,False,r'Local\CbbRefreshVerify795')
|
||||
acquired=False
|
||||
try:
|
||||
acquired=win32event.WaitForSingleObject(mutex,0) in (win32con.WAIT_OBJECT_0,win32con.WAIT_ABANDONED)
|
||||
if not acquired or stop is not None and stop.is_set():return waiting
|
||||
path=Path(proof['record_path'])
|
||||
record=read_session_record(path,evidence_root=path.parent)
|
||||
if 'retained_startup_cleanup' in record or _cancelled_diagnostic_record(row)!=proof:return waiting
|
||||
# Complete loaded identity and every prompt are checked before consuming
|
||||
# the one-shot intent. Unknown/multiple documents remain observation-only.
|
||||
from .diagnostic_open import _target_frame, _pending_prompt
|
||||
windows=_legacy_diagnostic_windows(dict(row,cleanup_desktop=proof['job']['desktop']))
|
||||
frame=_target_frame(windows,Path(proof['job']['pcb']).stem,require_ready=False)
|
||||
if frame is None:return waiting
|
||||
for window in windows:
|
||||
_pending_prompt([window],closing=proof['closed_frame'] is not None,frame=frame,
|
||||
pcb_name=Path(proof['job']['pcb']).name)
|
||||
if _cancelled_diagnostic_record(row)!=proof or stop is not None and stop.is_set():return waiting
|
||||
deadline=time.monotonic()+30
|
||||
record['retained_startup_cleanup']=dict(operation_id=proof['operation_id'],
|
||||
pcb_pid=row['pid'],owner_pid=os.getpid(),state='CLAIMED',closed_frame=proof['closed_frame'],
|
||||
deadline_monotonic=deadline,identity={k:row[k] for k in ('created_handle','image','owner_sid','session_id')})
|
||||
write_session_record(path,record) # Durable before No/Close; never removed or retried.
|
||||
with native_phase(read_only=True):
|
||||
return _close_registered_startup(row,handle,proof,stop=stop,deadline=deadline)
|
||||
except (OSError,ValueError,RuntimeError):
|
||||
return waiting
|
||||
finally:
|
||||
if acquired:win32event.ReleaseMutex(mutex)
|
||||
mutex.Close()
|
||||
|
||||
|
||||
def resume_cancelled_startup(path, *, stop=None):
|
||||
"""Observer-only entry for one late loaded, positively proved ordinary cancel."""
|
||||
from .session_record import _session
|
||||
from .failed_session import cancelled_prewrite_startup
|
||||
path=Path(path)
|
||||
try:
|
||||
session,state,identities=_session(path,path.parent)
|
||||
if 'retained_startup_cleanup' in session or stop is not None and stop.is_set():return False
|
||||
job=json.loads(path.with_name('request.json').read_text(encoding='utf-8'))
|
||||
if job.get('diagnostic_only') is not False:return False
|
||||
native=[p for p in identities if p.get('role')=='native'
|
||||
and Path(p['image']).name.casefold()=='expeditionpcb.exe']
|
||||
if len(native)!=1 or cancelled_prewrite_startup(job,native[0]['pid']) is None:return False
|
||||
plan=inspect_residual_sessions(session['library'],block_names=(session['block'],))
|
||||
rows=[r for r in plan['sessions'] if r['pid']==native[0]['pid']]
|
||||
if len(rows)!=1:return False
|
||||
row=dict(rows[0],session_records=[dict(path=str(path),operation_id=session['operation_id'])])
|
||||
proof=_cancelled_diagnostic_record(row)
|
||||
if proof is None:return False # Includes exact worker/helper exit and fresh loaded logs.
|
||||
_request_close(row,stop=stop)
|
||||
return True
|
||||
except (OSError,ValueError,KeyError,TypeError,RuntimeError):
|
||||
return False
|
||||
|
||||
|
||||
def _request_close(row, *, stop=None):
|
||||
import win32con, win32event
|
||||
import win32con, win32event, win32gui, win32process
|
||||
with _process_handle(row['pid']) as handle:
|
||||
if win32event.WaitForSingleObject(handle, 0) == win32con.WAIT_OBJECT_0:
|
||||
return {'release_status': 'RELEASED', 'detail': '已退出'}
|
||||
identity = _handle_identity(handle)
|
||||
if identity != {key: row.get(key) for key in ('created_handle', 'image')}:
|
||||
return {'release_status': 'IDENTITY_CHANGED', 'detail': '进程身份已变化,未关闭'}
|
||||
snapshot = _process_windows({row['pid']})
|
||||
windows, error = snapshot.get(row['pid'], []), _window_error(snapshot, row['pid'])
|
||||
if error:
|
||||
return {'release_status': 'WAITING', 'detail': '该会话窗口读取不完整,请重新检查:'+error}
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
|
||||
if proof := _cancelled_diagnostic_record(row):
|
||||
owner = _force_ownership(handle,row['pid'])
|
||||
if (owner.get('force_user_confirmed') is not True
|
||||
or any(owner.get(k) != row.get(k) for k in ('owner_sid','session_id'))):
|
||||
return {'release_status':'WAITING','detail':'取消启动会话的用户或 Windows 会话未确认'}
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status':'CANCELLED','detail':'已停止释放'}
|
||||
from .session_record import handoff_session
|
||||
record_path = Path(proof['record_path'])
|
||||
handoff_session(record_path, evidence_root=record_path.parent, observe_only=False)
|
||||
if proof['job'].get('diagnostic_only') is False:
|
||||
return _ordinary_startup_close(row,handle,proof,stop=stop)
|
||||
from .operation_queue import native_phase
|
||||
# This confirmed no-write native cleanup has its own single bounded
|
||||
# budget; metadata inactivity must not abandon it between No and Close.
|
||||
with native_phase(read_only=True):
|
||||
return _close_registered_startup(row, handle, proof, stop=stop)
|
||||
if _dismiss_startup_tip(row, handle, windows, stop=stop) is not None:
|
||||
# Legacy startup cleanup may already have sent WM_CLOSE. Only wait
|
||||
# for it here; never stack another close behind this acknowledgement.
|
||||
deadline = time.monotonic()+3
|
||||
while time.monotonic() < deadline:
|
||||
if win32event.WaitForSingleObject(handle, 100) == win32con.WAIT_OBJECT_0:
|
||||
return {'release_status': 'RELEASED', 'detail': '已关闭启动提示并正常退出'}
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
|
||||
return {'release_status': 'WAITING', 'detail': '已关闭启动提示,等待原生退出后重新检查'}
|
||||
windows = _process_windows({row['pid']}).get(row['pid'], [])
|
||||
if row['name'].casefold() == 'expeditionpcb.exe':
|
||||
from .failed_session import _startup_snapshot, _cancel_target
|
||||
for window in windows:
|
||||
if window['class'] != '#32770': continue
|
||||
with _window_desktop(window.get('desktop', '')):
|
||||
target = _cancel_target(_startup_snapshot(window['hwnd'], row['pid']))
|
||||
target = _cancel_target(_startup_snapshot(window['hwnd'], row['pid']))
|
||||
if target:
|
||||
_post_window_message(window, target[1].handle, row['pid'], win32con.BM_CLICK)
|
||||
win32gui.PostMessage(target[1].handle, win32con.BM_CLICK, 0, 0)
|
||||
deadline = time.monotonic()+3
|
||||
while time.monotonic() < deadline:
|
||||
if win32event.WaitForSingleObject(handle, 100) == win32con.WAIT_OBJECT_0:
|
||||
return {'release_status': 'RELEASED', 'detail': '已取消启动并退出'}
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
|
||||
snapshot = _process_windows({row['pid']})
|
||||
windows, error = snapshot.get(row['pid'], []), _window_error(snapshot, row['pid'])
|
||||
if error:
|
||||
break
|
||||
windows = _process_windows({row['pid']}).get(row['pid'], [])
|
||||
if close_target(row['name'], windows)[0] is not None: break
|
||||
break
|
||||
target, detail = close_target(row['name'], windows, incomplete=error)
|
||||
target, detail = close_target(row['name'], windows)
|
||||
if target is None: return {'release_status': 'WAITING', 'detail': detail}
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
|
||||
_post_window_message(target, target['hwnd'], row['pid'], win32con.WM_CLOSE)
|
||||
if win32process.GetWindowThreadProcessId(target['hwnd'])[1] != row['pid']:
|
||||
return {'release_status': 'IDENTITY_CHANGED', 'detail': '窗口归属已变化,未关闭'}
|
||||
win32gui.PostMessage(target['hwnd'], win32con.WM_CLOSE, 0, 0)
|
||||
deadline = time.monotonic()+3
|
||||
while time.monotonic() < deadline:
|
||||
if win32event.WaitForSingleObject(handle, 100) == win32con.WAIT_OBJECT_0:
|
||||
@@ -897,10 +351,6 @@ def _force_close(row, *, stop=None):
|
||||
import win32api, win32con, win32event
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
|
||||
if row.get('library'):
|
||||
from .session_record import active_write_records
|
||||
if active_write_records(row['library']):
|
||||
return {'release_status': 'WAITING', 'detail': '保存或原生调用尚未确认返回,未强制结束'}
|
||||
if reason := force_block_reason(row):
|
||||
return {'release_status': 'WAITING', 'detail': reason}
|
||||
with _process_handle(row['pid'], terminate=True) as handle:
|
||||
@@ -912,9 +362,7 @@ def _force_close(row, *, stop=None):
|
||||
if (not ownership['force_user_confirmed'] or
|
||||
any(ownership[k] != row.get(k) for k in ('owner_sid', 'session_id'))):
|
||||
return {'release_status': 'IDENTITY_CHANGED', 'detail': '用户或 Windows 会话已变化,未结束'}
|
||||
snapshot = _process_windows({row['pid']})
|
||||
activity = native_activity(row['name'], snapshot.get(row['pid'], []),
|
||||
incomplete=_window_error(snapshot, row['pid']))
|
||||
activity = native_activity(row['name'], _process_windows({row['pid']}).get(row['pid'], []))
|
||||
if reason := force_block_reason({**row, 'native_activity': activity}):
|
||||
return {'release_status': 'WAITING', 'detail': reason, 'native_activity': activity}
|
||||
if stop is not None and stop.is_set():
|
||||
@@ -925,16 +373,14 @@ def _force_close(row, *, stop=None):
|
||||
'detail': '已强制结束客户端,工程待检查,未执行修复' if exited else '已请求结束客户端,等待退出'}
|
||||
|
||||
|
||||
def _finish_library_release(library, evidence, block_names=(), stop=None):
|
||||
def _finish_library_release(library, evidence):
|
||||
from .library_lock import release_retained_library
|
||||
return release_retained_library(library, evidence,
|
||||
block_name=block_names[0] if len(block_names) == 1 else None,
|
||||
block_names=block_names, stop=stop)
|
||||
return release_retained_library(library, evidence)
|
||||
|
||||
|
||||
def _request_native_cancel(row, *, stop=None):
|
||||
"""Only click the exact currently visible Cancel control the user confirmed."""
|
||||
import win32con
|
||||
import win32con, win32gui, win32process
|
||||
if row.get('scope_confirmed') is not True:
|
||||
raise ValueError('取消目标归属未确认,请重新检查')
|
||||
fresh = next((r for r in query_process_snapshot() if r['pid'] == row['pid']), None)
|
||||
@@ -946,50 +392,25 @@ def _request_native_cancel(row, *, stop=None):
|
||||
owner = _force_ownership(handle, row['pid'])
|
||||
if not owner['force_user_confirmed'] or any(owner[k] != row.get(k) for k in ('owner_sid', 'session_id')):
|
||||
raise ValueError('取消目标用户/会话已变化')
|
||||
snapshot = _process_windows({row['pid']})
|
||||
prompt = _cancel_question(row['name'], snapshot.get(row['pid'], []),
|
||||
incomplete=_window_error(snapshot, row['pid']))
|
||||
prompt = _cancel_question(row['name'], _process_windows({row['pid']}).get(row['pid'], []))
|
||||
if not prompt or prompt != row.get('cancel_prompt'):
|
||||
raise ValueError('原生取消按钮已变化,请重新检查')
|
||||
button = prompt['button']
|
||||
if win32process.GetWindowThreadProcessId(button['hwnd'])[1] != row['pid']:
|
||||
raise ValueError('原生取消按钮归属已变化')
|
||||
if stop is not None and stop.is_set():
|
||||
return {'release_status': 'CANCELLED', 'detail': '已停止,未请求原生取消'}
|
||||
_post_window_message(prompt, button['hwnd'], row['pid'], win32con.BM_CLICK)
|
||||
win32gui.PostMessage(button['hwnd'], win32con.BM_CLICK, 0, 0)
|
||||
return {'release_status': 'WAITING', 'detail': '已请求原生取消,需重新检查实际结果;未强制结束'}
|
||||
|
||||
|
||||
def request_native_cancel(row, library, evidence_dir, *, stop=None):
|
||||
# Reuse serialized admission, consent and incremental evidence for cancellation.
|
||||
plan = {'library': str(library), 'sessions': [row], 'block_names': row.get('block_names', [])}
|
||||
plan = {'library': str(library), 'sessions': [row]}
|
||||
return release_residual_sessions(plan, evidence_dir, stop=stop, cancel_native=True)
|
||||
|
||||
|
||||
def _session_evidence(row):
|
||||
"""Keep the full preview in memory, but bound repeatedly written Output."""
|
||||
value = dict(row)
|
||||
if 'native_activity' in value:
|
||||
value['native_activity'] = {k: v for k, v in value['native_activity'].items() if k != 'output'}
|
||||
if 'windows' in value:
|
||||
value['windows'] = []
|
||||
for window in row['windows']:
|
||||
saved = {k: window[k] for k in ('hwnd', 'title', 'class', 'desktop', 'enabled') if k in window}
|
||||
output = window.get('output')
|
||||
if isinstance(output, str):
|
||||
data = output.encode('utf-8')
|
||||
saved.update(output_excerpt=data[:4096].decode('utf-8', errors='ignore'),
|
||||
output_bytes=len(data), output_sha256=hashlib.sha256(data).hexdigest(),
|
||||
output_truncated=len(data) > 4096)
|
||||
value['windows'].append(saved)
|
||||
return value
|
||||
|
||||
|
||||
def release_targets_complete(rows):
|
||||
return all(row.get('release_status') == 'RELEASED' or (
|
||||
row.get('scope_confirmed') is False and row.get('release_status') == 'OBSERVED') for row in rows)
|
||||
|
||||
|
||||
def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, cancel_native=False):
|
||||
from .operation_queue import note_metadata_progress
|
||||
library = Path(plan['library']).resolve()
|
||||
root = Path(evidence_dir).resolve()/('sessions-'+uuid4().hex[:12])
|
||||
if root.is_relative_to(library.parent) or library.parent.is_relative_to(root):
|
||||
@@ -1004,7 +425,7 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
from .management import _write_json
|
||||
try:
|
||||
result['report_saved'] = True
|
||||
_write_json(root/'result.json', {**result, 'sessions': [_session_evidence(row) for row in result['sessions']]})
|
||||
_write_json(root/'result.json', result)
|
||||
return True
|
||||
except OSError as error:
|
||||
result.update(status='PARTIAL', report_saved=False, evidence_error=str(error))
|
||||
@@ -1015,7 +436,7 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
consent_path = root/'consent.json'
|
||||
consent = {'version': 1, 'mode': 'cancel_native' if cancel_native else 'force_document_clients', 'library': str(library),
|
||||
'time_ns': time.time_ns(), 'sessions': [
|
||||
{**_session_evidence(row), 'force_allowed': not force_block_reason(row),
|
||||
{**row, 'force_allowed': not force_block_reason(row),
|
||||
'cancel_allowed': bool(row.get('cancel_prompt')) and row.get('scope_confirmed') is True,
|
||||
'force_block_reason': force_block_reason(row)} for row in plan['sessions']]}
|
||||
try:
|
||||
@@ -1029,7 +450,6 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
result['consent_path'] = str(consent_path)
|
||||
try:
|
||||
fresh = {r['pid']: r for r in query_process_snapshot()}
|
||||
note_metadata_progress()
|
||||
blocks = plan.get('block_names', ())
|
||||
roots = (tuple(library.parent/'ReusableBlocksLP'/b/'Work' for b in blocks)
|
||||
+ (library.parent/'SymbolLibs',)) if blocks else (library.parent,)
|
||||
@@ -1040,11 +460,6 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
outcome = {'release_status': 'RELEASED', 'detail': '已退出'}
|
||||
if stop is not None and stop.is_set():
|
||||
outcome = {'release_status': 'CANCELLED', 'detail': '已停止释放'}
|
||||
elif row.get('scope_confirmed') is False:
|
||||
from .library_lock import _owner_is_blocking
|
||||
outcome = ({'release_status': 'WAITING', 'detail': '当前归属已变化,请重新检查确认;未关闭'}
|
||||
if current is not None and _owner_is_blocking(current, library, roots) else
|
||||
{'release_status': 'OBSERVED', 'detail': '仅观察,未关闭;由目标资源检查确认是否影响当前库'})
|
||||
elif current is not None:
|
||||
from .library_lock import _owner_matches_scope
|
||||
scoped = _owner_matches_scope(current, library, roots) is True
|
||||
@@ -1060,9 +475,6 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
if not save():
|
||||
return result
|
||||
try:
|
||||
if not force and not cancel_native:
|
||||
row['session_records'] = [{k:r.get(k) for k in ('path','operation_id')}
|
||||
for r in plan.get('runtime_sessions', []) if r.get('path')]
|
||||
outcome = (_request_native_cancel(row, stop=stop) if cancel_native else
|
||||
(_force_close if force else _request_close)(row, stop=stop))
|
||||
except Exception as error:
|
||||
@@ -1070,9 +482,7 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
row.update(outcome)
|
||||
if not save():
|
||||
return result # Preserve completed facts; stop further actions on storage failure.
|
||||
note_metadata_progress()
|
||||
after = {r['pid']: r for r in query_process_snapshot()}
|
||||
note_metadata_progress()
|
||||
remaining_windows = _process_windows({r['pid'] for r in result['sessions']
|
||||
if r['release_status'] == 'WAITING' and r['pid'] in after})
|
||||
for row in result['sessions']:
|
||||
@@ -1080,24 +490,17 @@ def _release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, ca
|
||||
row.update(release_status='RELEASED', detail='已退出')
|
||||
elif row['release_status'] == 'WAITING':
|
||||
windows = remaining_windows.get(row['pid'], [])
|
||||
error = _window_error(remaining_windows, row['pid'])
|
||||
row.update(prompt=_save_question(windows, incomplete=error), windows=windows,
|
||||
windows_incomplete=bool(error), window_read_error=error,
|
||||
cancel_prompt=(_cancel_question(row['name'], windows, incomplete=error)
|
||||
row.update(prompt=_save_question(windows), windows=windows,
|
||||
cancel_prompt=(_cancel_question(row['name'], windows)
|
||||
if row.get('force_user_confirmed') is True else None),
|
||||
native_activity=native_activity(row['name'], windows, incomplete=error))
|
||||
if release_targets_complete(result['sessions']) and not (stop and stop.is_set()):
|
||||
result['proof'] = _finish_library_release(library, root/'library-proof',
|
||||
blocks, stop)
|
||||
native_activity=native_activity(row['name'], windows))
|
||||
if all(row['release_status'] == 'RELEASED' for row in result['sessions']) and not (stop and stop.is_set()):
|
||||
result['proof'] = _finish_library_release(library, root/'library-proof')
|
||||
proof = result['proof']
|
||||
if (proof.get('status') != 'RELEASE_CONFIRMED'
|
||||
or Path(proof.get('library', '')).resolve() != library):
|
||||
raise ValueError('释放证明与当前库不一致')
|
||||
result['status'] = 'RELEASE_CONFIRMED'
|
||||
from .session_record import record_session_release
|
||||
errors = record_session_release(proof, plan.get('runtime_sessions', []))
|
||||
if errors:
|
||||
result['evidence_error'] = ';'.join(errors)
|
||||
except BaseException as error:
|
||||
result.update(status='PARTIAL', detail=f'{type(error).__name__}: {error}')
|
||||
if not isinstance(error, Exception):
|
||||
@@ -1144,16 +547,18 @@ def answer_save_question(row, choice):
|
||||
|
||||
|
||||
def _answer_save_question(row, choice):
|
||||
import win32con
|
||||
import win32con, win32gui
|
||||
fresh = next((r for r in query_process_snapshot() if r['pid'] == row['pid']), None)
|
||||
if fresh is None or any(fresh.get(k) != row.get(k) for k in ('created', 'command', 'executable')):
|
||||
raise ValueError('进程已变化,请重新检查')
|
||||
with _process_handle(row['pid']) as handle:
|
||||
if _handle_identity(handle) != {k: row.get(k) for k in ('created_handle', 'image')}:
|
||||
raise ValueError('进程已变化,请重新检查')
|
||||
snapshot = _process_windows({row['pid']})
|
||||
prompt = _save_question(snapshot.get(row['pid'], []), incomplete=_window_error(snapshot, row['pid']))
|
||||
prompt = _save_question(_process_windows({row['pid']}).get(row['pid'], []))
|
||||
if not prompt or prompt != row.get('prompt'):
|
||||
raise ValueError('原生提示已变化,请重新检查')
|
||||
button = prompt['buttons'][choice]
|
||||
_post_window_message(prompt, button['hwnd'], row['pid'], win32con.BM_CLICK)
|
||||
import win32process
|
||||
if win32process.GetWindowThreadProcessId(button['hwnd'])[1] != row['pid']:
|
||||
raise ValueError('保存按钮归属已变化')
|
||||
win32gui.PostMessage(button['hwnd'], win32con.BM_CLICK, 0, 0)
|
||||
@@ -1,8 +1,5 @@
|
||||
Option Explicit
|
||||
Dim app, doc, pi, licensing, token, expected, attempt, stable, measuredStart, operationOK, remaining
|
||||
Dim nativeError, nativeDescription
|
||||
WaitForStartGate
|
||||
CheckCancellation
|
||||
expected = WScript.Arguments(0)
|
||||
Set app = GetObject(, "MGCPCB.Application")
|
||||
Set doc = app.ActiveDocument
|
||||
@@ -20,89 +17,40 @@ token = licensing.GetToken(doc.Validate(0))
|
||||
doc.Validate token
|
||||
LogElapsed "validate", measuredStart
|
||||
WScript.Echo "LICENSE_OK"
|
||||
CheckCancellation
|
||||
WScript.Echo "SAVE_START"
|
||||
CheckCancellation
|
||||
measuredStart = Timer
|
||||
On Error Resume Next
|
||||
operationOK = doc.Save()
|
||||
nativeError = Err.Number
|
||||
nativeDescription = Err.Description
|
||||
Err.Clear
|
||||
On Error GoTo 0
|
||||
LogElapsed "save", measuredStart
|
||||
If nativeError <> 0 Then
|
||||
WScript.Echo "SAVE_RESULT_UNKNOWN|" & CStr(nativeError) & "|" & nativeDescription
|
||||
WScript.Quit 11
|
||||
End If
|
||||
If Not operationOK Then
|
||||
WScript.Echo "SAVE_REJECTED"
|
||||
WScript.Quit 4
|
||||
End If
|
||||
If Not operationOK Then WScript.Quit 4
|
||||
WScript.Echo "SAVE_OK"
|
||||
CheckCancellation
|
||||
measuredStart = Timer
|
||||
On Error Resume Next
|
||||
operationOK = doc.IsSaved()
|
||||
nativeError = Err.Number
|
||||
nativeDescription = Err.Description
|
||||
Err.Clear
|
||||
On Error GoTo 0
|
||||
LogElapsed "is_saved", measuredStart
|
||||
If nativeError <> 0 Or Not operationOK Then
|
||||
WScript.Echo "POST_SAVE_FAILED|" & CStr(nativeError) & "|" & nativeDescription
|
||||
WScript.Quit 5
|
||||
End If
|
||||
If Not operationOK Then WScript.Quit 5
|
||||
WScript.Echo "IS_SAVED"
|
||||
stable = False
|
||||
WScript.Echo "POST_SAVE_CHECK"
|
||||
measuredStart = Timer
|
||||
For attempt = 1 To 50
|
||||
On Error Resume Next
|
||||
Set pi = doc.ProjectIntegration
|
||||
stable = (pi.ForwardAnnotationStatus = 2 And pi.SynchCESStatus = 2 And pi.LoadCESStatus = 2 And pi.BackAnnotationStatus = 2)
|
||||
nativeError = Err.Number
|
||||
nativeDescription = Err.Description
|
||||
Err.Clear
|
||||
On Error GoTo 0
|
||||
If nativeError <> 0 Then
|
||||
WScript.Echo "POST_SAVE_FAILED|" & CStr(nativeError) & "|" & nativeDescription
|
||||
WScript.Quit 7
|
||||
End If
|
||||
If stable Then
|
||||
If pi.ForwardAnnotationStatus = 2 And pi.SynchCESStatus = 2 And pi.LoadCESStatus = 2 And pi.BackAnnotationStatus = 2 Then
|
||||
stable = True
|
||||
Exit For
|
||||
End If
|
||||
WScript.Sleep 200
|
||||
Next
|
||||
LogElapsed "post_save_check", measuredStart
|
||||
If Not stable Then
|
||||
WScript.Echo "POST_SAVE_FAILED|integration_not_synchronized"
|
||||
WScript.Quit 7
|
||||
End If
|
||||
If Not stable Then WScript.Quit 7
|
||||
WScript.Echo "POST_SAVE_SYNCHRONIZED"
|
||||
On Error Resume Next
|
||||
operationOK = doc.IsSaved() And LCase(pi.ProjectFile) = LCase(expected)
|
||||
If WScript.Arguments.Count > 1 Then operationOK = operationOK And LCase(doc.Name) = LCase(WScript.Arguments(1))
|
||||
nativeError = Err.Number
|
||||
nativeDescription = Err.Description
|
||||
Err.Clear
|
||||
On Error GoTo 0
|
||||
If nativeError <> 0 Or Not operationOK Then
|
||||
WScript.Echo "POST_SAVE_FAILED|" & CStr(nativeError) & "|identity_or_saved_state_unconfirmed|" & nativeDescription
|
||||
WScript.Quit 8
|
||||
End If
|
||||
If Not doc.IsSaved() Then WScript.Quit 8
|
||||
WScript.Echo "CLOSE_START"
|
||||
CheckCancellation
|
||||
measuredStart = Timer
|
||||
On Error Resume Next
|
||||
operationOK = doc.Close(True)
|
||||
nativeError = Err.Number
|
||||
nativeDescription = Err.Description
|
||||
Err.Clear
|
||||
On Error GoTo 0
|
||||
LogElapsed "close", measuredStart
|
||||
If nativeError <> 0 Or Not operationOK Then
|
||||
WScript.Echo "CLOSE_FAILED|" & CStr(nativeError) & "|" & nativeDescription
|
||||
WScript.Quit 6
|
||||
End If
|
||||
If Not operationOK Then WScript.Quit 6
|
||||
WScript.Echo "CLOSE_OK"
|
||||
Set pi = Nothing
|
||||
Set doc = Nothing
|
||||
@@ -127,30 +75,11 @@ Sub CheckCancellation()
|
||||
If Len(cancelPath) = 0 Then Exit Sub
|
||||
Set fso = CreateObject("Scripting.FileSystemObject")
|
||||
If fso.FileExists(cancelPath) Then
|
||||
WScript.Echo "CANCELLED_BEFORE_SAVE"
|
||||
WScript.Echo "VERIFY_CANCELLED"
|
||||
WScript.Quit 9
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Sub WaitForStartGate()
|
||||
Dim fso, started, elapsed
|
||||
If WScript.Arguments.Count < 4 Then Exit Sub
|
||||
Set fso = CreateObject("Scripting.FileSystemObject")
|
||||
started = Timer
|
||||
Do
|
||||
CheckCancellation
|
||||
If fso.FileExists(WScript.Arguments(3)) Then Exit Sub
|
||||
elapsed = Timer - started
|
||||
If elapsed < 0 Then elapsed = elapsed + 86400
|
||||
If elapsed >= 30 Then
|
||||
WScript.Echo "CANCELLED_BEFORE_SAVE|start_gate_timeout"
|
||||
WScript.Quit 9
|
||||
End If
|
||||
WScript.Sleep 50
|
||||
Loop
|
||||
End Sub
|
||||
|
||||
Sub LogElapsed(phaseName, started)
|
||||
Dim elapsed
|
||||
elapsed = Timer - started
|
||||
|
||||
@@ -4,6 +4,7 @@ Unknown engineering files are primary. Only explicit runtime, history and
|
||||
generated categories are ignored by semantic comparisons; they are still copied
|
||||
and their membership/size/mtime must remain stable throughout the snapshot.
|
||||
"""
|
||||
from concurrent.futures import ThreadPoolExecutor
|
||||
from contextlib import ExitStack
|
||||
from dataclasses import asdict, dataclass
|
||||
import hashlib
|
||||
@@ -11,19 +12,9 @@ import os
|
||||
from pathlib import Path
|
||||
import shutil
|
||||
import stat
|
||||
from .operation_queue import note_metadata_progress
|
||||
|
||||
|
||||
MANIFEST_VERSION = 1
|
||||
MANIFEST_RULE_VERSION = 2
|
||||
_ROOT_RUNTIME_PREFIX = 'work.before-restore-'
|
||||
_ROOT_RUNTIME_PATH = ('projectbackup', 'backups')
|
||||
_NATIVE_RUNTIME_DIRECTORIES = ('log', 'dbcheck', 'dbrestore')
|
||||
_NATIVE_SERVER_DIRECTORY = 'cdbsvr'
|
||||
_PROJECT_PCB_DIRECTORY = 'pcb'
|
||||
_PROJECT_DATABASE_PREFIXES = (('database',), (_PROJECT_PCB_DIRECTORY, 'database'))
|
||||
_NONPRIMARY_FILENAMES = ('saddress.adr', 'saddress_.adr')
|
||||
_NONPRIMARY_FILENAME_PREFIXES = ('~$',)
|
||||
_NONPRIMARY_DIRECTORIES = frozenset({
|
||||
'log', 'logs', 'temp', 'tmp', '__pycache__', 'backup', 'backups',
|
||||
'output', 'outputs', 'report', 'reports', 'gerber', 'gerbers', 'odb++',
|
||||
@@ -38,21 +29,22 @@ def _root_runtime(directories):
|
||||
"""Known runtime/history children of a library or project workspace root."""
|
||||
return bool(directories and (
|
||||
directories[0] in _NONPRIMARY_DIRECTORIES
|
||||
or directories[0].startswith(_ROOT_RUNTIME_PREFIX)
|
||||
or directories[:len(_ROOT_RUNTIME_PATH)] == _ROOT_RUNTIME_PATH))
|
||||
or directories[0].startswith('work.before-restore-')
|
||||
or directories[:2] == ('projectbackup', 'backups')))
|
||||
|
||||
|
||||
def _native_runtime(directories, database_prefix):
|
||||
runtime_prefix = database_prefix + (_NATIVE_SERVER_DIRECTORY,)
|
||||
runtime_prefix = database_prefix + ('cdbsvr',)
|
||||
return (directories[:len(runtime_prefix)] == runtime_prefix
|
||||
and len(directories) > len(runtime_prefix)
|
||||
and directories[len(runtime_prefix)] in _NATIVE_RUNTIME_DIRECTORIES)
|
||||
and directories[len(runtime_prefix)] in ('log', 'dbcheck', 'dbrestore'))
|
||||
|
||||
|
||||
def _project_runtime(directories):
|
||||
return (_root_runtime(directories)
|
||||
or (directories[:1] == (_PROJECT_PCB_DIRECTORY,) and _root_runtime(directories[1:]))
|
||||
or any(_native_runtime(directories, prefix) for prefix in _PROJECT_DATABASE_PREFIXES))
|
||||
or (directories[:1] == ('pcb',) and _root_runtime(directories[1:]))
|
||||
or _native_runtime(directories, ('database',))
|
||||
or _native_runtime(directories, ('pcb', 'database')))
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
@@ -93,8 +85,7 @@ class ManifestScope:
|
||||
"""
|
||||
directories = parts if directory else parts[:-1]
|
||||
if not directory and (Path(parts[-1]).suffix in _NONPRIMARY_SUFFIXES
|
||||
or parts[-1] in _NONPRIMARY_FILENAMES
|
||||
or parts[-1].startswith(_NONPRIMARY_FILENAME_PREFIXES)):
|
||||
or parts[-1] == 'saddress.adr' or parts[-1].startswith('~$')):
|
||||
return True
|
||||
if self.kind == 'project':
|
||||
return _project_runtime(directories)
|
||||
@@ -132,36 +123,6 @@ class ManifestScope:
|
||||
return 'shared_dependency'
|
||||
|
||||
|
||||
def comparison_rules(scope):
|
||||
"""Describe semantic exclusions using the classifier's rule constants."""
|
||||
project_positions = ['project root or its PCB child']
|
||||
project_native = ' or '.join('/'.join(prefix + (_NATIVE_SERVER_DIRECTORY,))
|
||||
for prefix in _PROJECT_DATABASE_PREFIXES)
|
||||
native_positions = [project_native + ' under project root']
|
||||
if scope.kind == 'library':
|
||||
project_positions = ['library root', 'selected CBB Work/Cert root or its PCB child']
|
||||
native_positions = [
|
||||
project_native + ' under selected CBB Work/Cert',
|
||||
'SymbolLibs/<partition>/' + _NATIVE_SERVER_DIRECTORY,
|
||||
'<shared dependency>/' + _NATIVE_SERVER_DIRECTORY,
|
||||
]
|
||||
return {
|
||||
'rule_version': MANIFEST_RULE_VERSION,
|
||||
'excluded_categories': sorted(_NONPRIMARY_DIRECTORIES),
|
||||
'excluded_suffixes': sorted(_NONPRIMARY_SUFFIXES),
|
||||
'runtime_exclusions': {
|
||||
'directory_name_positions': project_positions,
|
||||
'directory_prefixes': [_ROOT_RUNTIME_PREFIX],
|
||||
'relative_directories': ['/'.join(_ROOT_RUNTIME_PATH)],
|
||||
'native_directory_names': sorted(_NATIVE_RUNTIME_DIRECTORIES),
|
||||
'native_directory_positions': native_positions,
|
||||
'file_names': list(_NONPRIMARY_FILENAMES),
|
||||
'file_name_prefixes': list(_NONPRIMARY_FILENAME_PREFIXES),
|
||||
'coordination_checkpoints': 'recognized CBB coordination checkpoints',
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def hash_file(path):
|
||||
digest = hashlib.sha256()
|
||||
with Path(path).open('rb') as stream:
|
||||
@@ -207,7 +168,6 @@ def scan_tree(root, *, scope=None, exclude=None, check=None):
|
||||
if not (stat.S_ISDIR(metadata.st_mode) or stat.S_ISREG(metadata.st_mode)):
|
||||
raise ValueError(f'不支持的特殊文件:{entry.path}')
|
||||
entries[path] = metadata
|
||||
note_metadata_progress()
|
||||
if stat.S_ISDIR(metadata.st_mode):
|
||||
folders.append(path)
|
||||
return dict(sorted(entries.items()))
|
||||
@@ -251,13 +211,12 @@ def build_manifest(root, *, scope=None, exclude=None, progress=None, hash_functi
|
||||
files = {}
|
||||
hashed_bytes = 0
|
||||
_emit(progress, 'hash', 0, 0, total_files=len(selected))
|
||||
# Stay on the bounded task thread: executor workers are joined at interpreter exit.
|
||||
for count, (relative, item) in enumerate(map(hashed, selected), 1):
|
||||
note_metadata_progress()
|
||||
files[relative] = item
|
||||
hashed_bytes += item['size']
|
||||
if count % 256 == 0 or count == len(selected):
|
||||
_emit(progress, 'hash', count, hashed_bytes, total_files=len(selected))
|
||||
with ThreadPoolExecutor(max_workers=8) as pool:
|
||||
for count, (relative, item) in enumerate(pool.map(hashed, selected), 1):
|
||||
files[relative] = item
|
||||
hashed_bytes += item['size']
|
||||
if count % 256 == 0 or count == len(selected):
|
||||
_emit(progress, 'hash', count, hashed_bytes, total_files=len(selected))
|
||||
# Check primary membership and metadata again after every hash completed.
|
||||
# Runtime files can change/add/disappear without a semantic conflict.
|
||||
after = scan_tree(root, scope=scope, exclude=exclude)
|
||||
@@ -287,7 +246,6 @@ def build_exclusive_library_manifest(root, *, scope, progress=None):
|
||||
raise OSError(f'LIBRARY_DATABASE_IN_USE: 无法独占读取 {path}:{error}') from error
|
||||
handles[path] = handle
|
||||
stack.callback(handle.Close)
|
||||
note_metadata_progress()
|
||||
|
||||
def digest(path):
|
||||
if path not in handles:
|
||||
@@ -313,10 +271,7 @@ def copy_verified(source, destination, *, scope=None, progress=None, hash_functi
|
||||
|
||||
Native icdb.dat/LMC files are held with exclusive read handles for the copy.
|
||||
Their expected SHA256 comes from the source read stream, independently of
|
||||
hashing destination bytes. Unlocked primary files are also hashed while
|
||||
streaming the copy, then rehashed at source to detect even same-size/mtime
|
||||
edits. Every primary destination is independently hashed. Failures retain
|
||||
the partial destination evidence.
|
||||
hashing destination bytes. Failures retain the partial destination evidence.
|
||||
Progress receives one dict with stage, hashed_files/bytes and copied_files.
|
||||
"""
|
||||
import win32con
|
||||
@@ -331,7 +286,7 @@ def copy_verified(source, destination, *, scope=None, progress=None, hash_functi
|
||||
destination.mkdir(parents=True, exist_ok=False)
|
||||
files = [path for path, info in entries.items() if stat.S_ISREG(info.st_mode)]
|
||||
from .library_lock import owned_snapshot
|
||||
# Resolve ownership on the operation thread before copying.
|
||||
# Resolve ownership on the operation thread, before parallel copy workers.
|
||||
owned = {path: data for path in files
|
||||
if path.name.endswith('.cbb-upload.lock')
|
||||
and (data := owned_snapshot(path)) is not None}
|
||||
@@ -374,31 +329,25 @@ def copy_verified(source, destination, *, scope=None, progress=None, hash_functi
|
||||
shutil.copystat(path, copied)
|
||||
if stream_hash is not None:
|
||||
digest = stream_hash.hexdigest()
|
||||
elif label is not None:
|
||||
stream_hash = hashlib.sha256()
|
||||
with path.open('rb') as incoming, copied.open('wb') as outgoing:
|
||||
for data in iter(lambda: incoming.read(1024 * 1024), b''):
|
||||
stream_hash.update(data)
|
||||
outgoing.write(data)
|
||||
shutil.copystat(path, copied)
|
||||
digest = stream_hash.hexdigest()
|
||||
else:
|
||||
if label is not None:
|
||||
digest = hash_function(path)
|
||||
shutil.copy2(path, copied)
|
||||
before, after = entries[path], path.stat()
|
||||
if (before.st_size, before.st_mtime_ns) != (after.st_size, after.st_mtime_ns):
|
||||
raise OSError(f'复制期间文件变化:{path}')
|
||||
return relative.as_posix(), digest, label
|
||||
|
||||
for count, (relative, digest, label) in enumerate(map(copy_file, files), 1):
|
||||
note_metadata_progress()
|
||||
if label is not None:
|
||||
size = entries[source/relative].st_size
|
||||
record[relative] = {'size': size, 'sha256': digest, 'scope': label}
|
||||
hashed_count += 1
|
||||
hashed_bytes += size
|
||||
if count % 256 == 0 or count == len(files):
|
||||
_emit(progress, 'copy', hashed_count, hashed_bytes,
|
||||
copied_files=count, total_files=len(files))
|
||||
with ThreadPoolExecutor(max_workers=8) as pool:
|
||||
for count, (relative, digest, label) in enumerate(pool.map(copy_file, files), 1):
|
||||
if label is not None:
|
||||
size = entries[source/relative].st_size
|
||||
record[relative] = {'size': size, 'sha256': digest, 'scope': label}
|
||||
hashed_count += 1
|
||||
hashed_bytes += size
|
||||
if count % 256 == 0 or count == len(files):
|
||||
_emit(progress, 'copy', hashed_count, hashed_bytes,
|
||||
copied_files=count, total_files=len(files))
|
||||
|
||||
def validate_bytes(relative):
|
||||
item = record[relative]
|
||||
@@ -407,9 +356,8 @@ def copy_verified(source, destination, *, scope=None, progress=None, hash_functi
|
||||
raise OSError(f'复制期间主要文件内容变化:{path}')
|
||||
if hash_function(destination/relative) != item['sha256']:
|
||||
raise OSError(f'复制内容校验失败:{path}')
|
||||
for relative in record:
|
||||
validate_bytes(relative)
|
||||
note_metadata_progress()
|
||||
with ThreadPoolExecutor(max_workers=8) as pool:
|
||||
list(pool.map(validate_bytes, record))
|
||||
if _metadata_record(source, scan_tree(source)) != expected_metadata:
|
||||
raise OSError(f'复制期间目录内容变化:{source}')
|
||||
if _metadata_record(destination, scan_tree(destination)) != expected_metadata:
|
||||
|
||||
@@ -1,595 +0,0 @@
|
||||
"""Bounded registration and observation for native calls that outlive a task."""
|
||||
from contextlib import ExitStack
|
||||
from datetime import datetime, timezone
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
from pathlib import Path
|
||||
import stat
|
||||
import threading
|
||||
from uuid import uuid4
|
||||
|
||||
PROTOCOL = 'cbb-runtime-session'
|
||||
MAX_BYTES = 64 * 1024
|
||||
IDENTITY_KEYS = ('pid', 'created_handle', 'image', 'owner_sid', 'session_id')
|
||||
_observers = {}
|
||||
_observer_guard = threading.Lock()
|
||||
_retained_libraries = {}
|
||||
_retained_results = {}
|
||||
|
||||
|
||||
def _library_key(library):
|
||||
return os.path.normcase(os.path.normpath(str(library)))
|
||||
|
||||
|
||||
def library_available(library, *, live_only=False):
|
||||
"""Cached queue predicate: no file, process or network queries."""
|
||||
if live_only:
|
||||
return _live_library_available(library)
|
||||
key = _library_key(library)
|
||||
with _observer_guard:
|
||||
return not any(key in aliases for aliases in _retained_libraries.values())
|
||||
|
||||
|
||||
def _live_library_available(library):
|
||||
"""Ignore stale retention, but wait for an actual registered observer."""
|
||||
key = _library_key(library)
|
||||
with _observer_guard:
|
||||
for path, aliases in _retained_libraries.items():
|
||||
observer = _observers.get(path)
|
||||
if key not in aliases or observer is None or not observer[0].is_alive():
|
||||
continue
|
||||
state = _retained_results.get(path, {})
|
||||
if (state.get('observer_initializing') is True or state.get('status') == 'ACTIVE'
|
||||
or state.get('owned_worker_alive') is True):
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
def retained_session_snapshot(library):
|
||||
key = _library_key(library)
|
||||
with _observer_guard:
|
||||
return {path: (aliases, _retained_results.get(path, {}).get('block'),
|
||||
_retained_results.get(path, {}).get('operation_id'))
|
||||
for path, aliases in _retained_libraries.items() if key in aliases}
|
||||
|
||||
|
||||
def reconciled_retained_sessions(snapshot, *, block_name=None):
|
||||
with _observer_guard:
|
||||
return [{'path': path, 'block_name': block, 'operation_id': operation_id}
|
||||
for path, (aliases, block, operation_id) in snapshot.items()
|
||||
if _retained_libraries.get(path) is aliases
|
||||
and _retained_results.get(path, {}).get('operation_id') == operation_id
|
||||
and (block_name is None or block == block_name)]
|
||||
|
||||
|
||||
def acknowledge_library_release(proof, snapshot, *, block_name=None):
|
||||
"""Called under fresh proof handles; never clear a newer handoff."""
|
||||
if proof.get('status') != 'RELEASE_CONFIRMED':
|
||||
return
|
||||
key = _library_key(proof['library'])
|
||||
with _observer_guard:
|
||||
records = [dict(path=path, operation_id=operation_id)
|
||||
for path, (aliases, block, operation_id) in snapshot.items()
|
||||
if key in aliases and _retained_libraries.get(path) is aliases
|
||||
and _retained_results.get(path, {}).get('operation_id') == operation_id
|
||||
and (block_name is None or block == block_name)]
|
||||
record_session_release(proof, records)
|
||||
with _observer_guard:
|
||||
for path, (aliases, block, operation_id) in snapshot.items():
|
||||
if (key in aliases and _retained_libraries.get(path) is aliases
|
||||
and _retained_results.get(path, {}).get('operation_id') == operation_id
|
||||
and (block_name is None or block == block_name)):
|
||||
_retained_libraries.pop(path, None)
|
||||
_retained_results.pop(path, None)
|
||||
|
||||
|
||||
def _proof_covers_session(proof, session):
|
||||
"""A receipt may acknowledge only resources actually covered by its proof."""
|
||||
scope = proof.get('resource_scope')
|
||||
library = session.get('library')
|
||||
if (proof.get('status') != 'RELEASE_CONFIRMED' or proof.get('lease_state') != 'RELEASED'
|
||||
or not isinstance(scope, dict) or scope.get('scope_state') != 'OBSERVED'
|
||||
or not library or _library_key(proof.get('library', '')) != _library_key(library)
|
||||
or _library_key(scope.get('library', '')) != _library_key(library)):
|
||||
return False
|
||||
if proof.get('proof_scope') == 'LIBRARY':
|
||||
return not scope.get('block_names') and not proof.get('proof_block_names')
|
||||
blocks = proof.get('proof_block_names')
|
||||
observed = scope.get('block_names')
|
||||
if (proof.get('proof_scope') not in ('BLOCK', 'BLOCKS') or not isinstance(blocks, list)
|
||||
or not blocks or not isinstance(observed, list) or blocks != observed):
|
||||
return False
|
||||
return bool(session.get('block') and session['block'] in blocks)
|
||||
|
||||
|
||||
def record_session_release(proof, records):
|
||||
"""Persist a past proof only for the pre-proof operation, never replay it."""
|
||||
errors = []
|
||||
if proof.get('status') != 'RELEASE_CONFIRMED':
|
||||
return errors
|
||||
library = Path(proof['library']).resolve()
|
||||
for record in records:
|
||||
try:
|
||||
path = Path(record['path'])
|
||||
session = read_session_record(path, evidence_root=path.parent)
|
||||
if (session['operation_id'] != record.get('operation_id')
|
||||
or Path(session['library']).resolve() != library
|
||||
or not _proof_covers_session(proof, session)):
|
||||
continue
|
||||
write_session_record(path.with_name('observation-release-'+uuid4().hex+'.json'), {
|
||||
'operation_id': session['operation_id'], 'library': str(library),
|
||||
'status': 'RELEASED', 'release_proof': proof})
|
||||
except (OSError, ValueError, KeyError) as error:
|
||||
errors.append(str(error))
|
||||
logging.getLogger(__name__).warning('Unable to record session release', exc_info=True)
|
||||
return errors
|
||||
|
||||
|
||||
def retained_session_states(library):
|
||||
key = _library_key(library)
|
||||
with _observer_guard:
|
||||
return [dict(_retained_results[path], path=path) for path, aliases in _retained_libraries.items()
|
||||
if key in aliases and path in _retained_results]
|
||||
|
||||
|
||||
def library_wait_reason(library):
|
||||
"""Cached explanation for queue admission; never probe disk or native clients."""
|
||||
key = _library_key(library)
|
||||
with _observer_guard:
|
||||
retained = [path for path, aliases in _retained_libraries.items() if key in aliases]
|
||||
names = sorted({_retained_results.get(path, {}).get('block') or '当前库' for path in retained})
|
||||
return '该库有残留会话('+', '.join(names)+'),请查看并处理。' if names else ''
|
||||
|
||||
|
||||
def register_worker_session(worker, job):
|
||||
"""The launcher must persist identity before opening the worker's gate."""
|
||||
path = Path(job['session_record_path'])
|
||||
from .operation_queue import check_worker_admission, current_context, bind_supervised_worker
|
||||
check_worker_admission(job)
|
||||
context = current_context()
|
||||
protection = ('duplicated_lease' if job.get('worker_lease_handle') else
|
||||
'worker_owned_lease' if job.get('operation') == 'native_backup' else
|
||||
'inspection_only' if job.get('inspection_only') is True else
|
||||
'catalog_readonly' if job.get('worker_role') == 'catalog_readonly'
|
||||
and job.get('operation') == 'catalog' else None)
|
||||
if context is not None and context.native_policy == 'external':
|
||||
if protection is None or worker.pid == os.getpid():
|
||||
raise RuntimeError('WORKER_OWNERSHIP_REQUIRED: 原生写入未登记独立进程和租约。')
|
||||
from .icdb_ownership import session_resource_scope
|
||||
record = ({k: job.get(k) for k in (
|
||||
'operation_id', 'operation', 'library', 'block', 'desktop', 'cancel_signal', 'worker_lease_handle',
|
||||
'worker_role', 'start_gate_protocol', 'start_gate')}
|
||||
| {'processes': [{'role': 'worker', **process_identity(worker.pid)}],
|
||||
'lease_state': 'ACTIVE', 'resource_scope': session_resource_scope(job),
|
||||
'worker_protection': protection, 'task_operation_id': context.operation_id if context else None,
|
||||
'blocked_resources': [], 'data_recovery_required': None})
|
||||
if job.get('start_gate_protocol') == 'event-v1':
|
||||
import win32api, win32con, win32event
|
||||
event = win32event.CreateEvent(None, True, False, None)
|
||||
process = getattr(worker, 'handle', None) or getattr(worker, '_handle', None)
|
||||
if process is None:
|
||||
raise RuntimeError('WORKER_ADMISSION_UNCONFIRMED: 缺少工作进程句柄。')
|
||||
# Use the launch handle, never a reopened PID. The child's event survives
|
||||
# supervisor exit even before Python startup or journal reads finish.
|
||||
remote = win32api.DuplicateHandle(win32api.GetCurrentProcess(), event,
|
||||
process, 0, False, win32con.DUPLICATE_SAME_ACCESS)
|
||||
record['worker_start_handle'] = remote.Detach()
|
||||
worker._start_event = event
|
||||
worker._start_binding = (str(path), job['operation_id'], job['start_gate'])
|
||||
write_session_record(path, record)
|
||||
bind_supervised_worker(path, record)
|
||||
worker.session_record_path = path
|
||||
worker.cbb_library = job['library']
|
||||
check_worker_admission(job) # A slow registration must not open a gate after UI shutdown.
|
||||
|
||||
|
||||
def update_worker_state(job, phase, *, identities=(), observed_identities=(), write_outcome=None,
|
||||
required=False, continuation=False):
|
||||
"""required controls I/O; only existing same-phase calls may continue recording after supervisor loss."""
|
||||
if not job.get('session_record_path'):
|
||||
if required:
|
||||
raise ValueError('原生写入缺少会话记录位置,未提交新的调用')
|
||||
return False
|
||||
from .desktop_worker import worker_phase
|
||||
with worker_phase(job['operation_id'], phase, continuation=continuation):
|
||||
path = Path(job['session_record_path']).with_name('worker-state.json')
|
||||
try:
|
||||
state = ({'operation_id': job['operation_id'], 'processes': []} if not path.exists()
|
||||
else read_session_record(path, evidence_root=path.parent))
|
||||
if state['operation_id'] != job['operation_id']:
|
||||
raise ValueError('工作状态操作身份不一致')
|
||||
for role, pid in identities:
|
||||
if pid and not any(p['pid'] == pid for p in state['processes']):
|
||||
state['processes'].append({'role': role, **process_identity(pid)})
|
||||
# Callers supply these only after validating an open handle's exact
|
||||
# job membership; do not reopen a snapshot PID during publication.
|
||||
for role, identity in observed_identities:
|
||||
bound = {key: identity[key] for key in IDENTITY_KEYS}
|
||||
if not any(all(p.get(key) == value for key, value in bound.items()) for p in state['processes']):
|
||||
state['processes'].append({'role': role, **bound})
|
||||
state['phase'] = phase
|
||||
if write_outcome is not None:
|
||||
state['write_outcome'] = write_outcome
|
||||
write_session_record(path, state)
|
||||
return True
|
||||
except Exception:
|
||||
if required:
|
||||
raise
|
||||
# An unavailable journal cannot interrupt an already executing COM call.
|
||||
logging.getLogger(__name__).warning('Worker session journal unavailable', exc_info=True)
|
||||
return False
|
||||
|
||||
|
||||
def dispatch_native(job, call, *, phase='NATIVE_CALL', asynchronous=False, required=False):
|
||||
"""Reserve the native call before dispatch; asynchronous results require an explicit acknowledgment."""
|
||||
update_worker_state(job, phase, required=required)
|
||||
try:
|
||||
result = call()
|
||||
except BaseException:
|
||||
update_worker_state(job, 'UNCONFIRMED')
|
||||
raise
|
||||
if not asynchronous:
|
||||
update_worker_state(job, 'POSTCALL')
|
||||
return result
|
||||
|
||||
|
||||
def process_identity(pid):
|
||||
from .residual_sessions import _process_handle, _handle_identity, _force_ownership
|
||||
with _process_handle(pid) as handle:
|
||||
identity = _handle_identity(handle)
|
||||
identity.update(_force_ownership(handle, pid))
|
||||
return {'pid': int(pid), **{k: identity[k] for k in IDENTITY_KEYS if k != 'pid'}}
|
||||
|
||||
|
||||
def write_session_record(path, record):
|
||||
path = Path(path)
|
||||
value = {'protocol': PROTOCOL, 'version': 1, **record,
|
||||
'recorded_at': datetime.now(timezone.utc).isoformat()}
|
||||
data = json.dumps(value, ensure_ascii=False, default=str, indent=2).encode('utf-8')
|
||||
if len(data) > MAX_BYTES:
|
||||
raise ValueError('会话记录超过大小限制')
|
||||
pending = path.with_name(path.name + '.' + uuid4().hex + '.pending')
|
||||
try:
|
||||
with pending.open('xb') as stream:
|
||||
stream.write(data)
|
||||
stream.flush()
|
||||
os.fsync(stream.fileno())
|
||||
os.replace(pending, path)
|
||||
finally:
|
||||
pending.unlink(missing_ok=True)
|
||||
|
||||
|
||||
def read_session_record(path, *, evidence_root):
|
||||
path, root = Path(path).absolute(), Path(evidence_root).absolute()
|
||||
if not path.is_relative_to(root) or path == root:
|
||||
raise ValueError('会话记录位于受控证据目录之外')
|
||||
# Check every component before resolve, which would hide a junction.
|
||||
for item in (path, *path.parents):
|
||||
attrs = item.lstat()
|
||||
if getattr(attrs, 'st_file_attributes', 0) & stat.FILE_ATTRIBUTE_REPARSE_POINT:
|
||||
raise ValueError('会话记录路径包含重解析点')
|
||||
with path.open('rb') as stream:
|
||||
data = stream.read(MAX_BYTES + 1)
|
||||
if len(data) > MAX_BYTES:
|
||||
raise ValueError('会话记录超过大小限制')
|
||||
value = json.loads(data)
|
||||
if (not isinstance(value, dict) or value.get('protocol') != PROTOCOL or
|
||||
type(value.get('version')) is not int or value['version'] != 1 or
|
||||
not isinstance(value.get('operation_id'), str) or not value['operation_id']):
|
||||
raise ValueError('会话记录协议无效')
|
||||
return value
|
||||
|
||||
|
||||
def _session(path, root):
|
||||
value = read_session_record(path, evidence_root=root)
|
||||
if (not isinstance(value.get('library'), str) or not Path(value['library']).is_absolute()
|
||||
or Path(value['library']).suffix.casefold() != '.lmc'):
|
||||
raise ValueError('会话库身份无效')
|
||||
state_path = Path(path).with_name('worker-state.json')
|
||||
state = {}
|
||||
if state_path.exists():
|
||||
state = read_session_record(state_path, evidence_root=root)
|
||||
if state['operation_id'] != value['operation_id']:
|
||||
raise ValueError('工作进程状态不属于本次操作')
|
||||
processes = value.get('processes', []) + state.get('processes', [])
|
||||
if not processes:
|
||||
raise ValueError('会话缺少精确进程身份')
|
||||
for process in processes:
|
||||
if (not isinstance(process, dict) or any(k not in process for k in IDENTITY_KEYS)
|
||||
or type(process['pid']) is not int or process['pid'] <= 0):
|
||||
raise ValueError('会话进程身份不完整')
|
||||
return value, state, processes
|
||||
|
||||
|
||||
def _result(status, detail='', *, session=None, state=None, proof=None):
|
||||
return {'status': status, 'detail': detail, 'library': (session or {}).get('library'),
|
||||
'block': (session or {}).get('block'),
|
||||
'operation_id': (session or {}).get('operation_id'),
|
||||
'phase': (state or {}).get('phase', 'UNCONFIRMED'), 'release_proof': proof,
|
||||
'lease_state': (proof or {}).get('lease_state', 'ACTIVE' if status == 'ACTIVE' else 'UNCONFIRMED'),
|
||||
'resource_scope': (proof or {}).get('resource_scope') or (session or {}).get('resource_scope')
|
||||
or {'scope_state': 'RECHECK_REQUIRED'},
|
||||
'blocked_resources': (proof or {}).get('blocked_resources', (session or {}).get('blocked_resources', [])),
|
||||
'data_recovery_required': (proof or {}).get('data_recovery_required',
|
||||
(session or {}).get('data_recovery_required'))}
|
||||
|
||||
|
||||
def _reconcile(path, root, handles, stack, *, release=True):
|
||||
import pywintypes, win32api, win32con, win32event
|
||||
from .residual_sessions import _handle_identity, _force_ownership
|
||||
session, state, processes = _session(path, root)
|
||||
active = False
|
||||
for identity in processes:
|
||||
if identity.get('role') == 'supervisor':
|
||||
continue
|
||||
key = tuple(identity[k] for k in IDENTITY_KEYS)
|
||||
changed_key = ('identity_changed', *key)
|
||||
if changed_key in handles:
|
||||
return _result('IDENTITY_CHANGED', '记录中的进程身份已变化,仅供观察', session=session, state=state)
|
||||
if key not in handles:
|
||||
try:
|
||||
handle = win32api.OpenProcess(win32con.SYNCHRONIZE | 0x1000, False, identity['pid'])
|
||||
except pywintypes.error as error:
|
||||
if error.winerror != 87: # Access denied is not an exit observation.
|
||||
raise
|
||||
handles[key] = None
|
||||
else:
|
||||
stack.callback(handle.Close)
|
||||
if win32event.WaitForSingleObject(handle, 0) == win32con.WAIT_OBJECT_0:
|
||||
handles[key] = handle
|
||||
continue
|
||||
actual = {'pid': identity['pid'], **_handle_identity(handle),
|
||||
**_force_ownership(handle, identity['pid'])}
|
||||
if any(actual[k] != identity[k] for k in IDENTITY_KEYS):
|
||||
handles[key] = handle
|
||||
handles[changed_key] = True
|
||||
return _result('IDENTITY_CHANGED', '记录中的进程身份已变化,仅供观察',
|
||||
session=session, state=state)
|
||||
handles[key] = handle
|
||||
handle = handles[key]
|
||||
if handle is not None and win32event.WaitForSingleObject(handle, 0) != win32con.WAIT_OBJECT_0:
|
||||
active = True
|
||||
if active:
|
||||
return _result('ACTIVE', '原生调用尚未确认返回', session=session, state=state)
|
||||
if not release:
|
||||
return _result('UNCONFIRMED', '记录中的进程已退出,需确认库占用已释放', session=session, state=state)
|
||||
from .library_lock import release_retained_library
|
||||
try:
|
||||
proof = release_retained_library(session['library'], Path(path).parent/'release-proof',
|
||||
block_name=session.get('block'))
|
||||
except Exception as error:
|
||||
return _result('UNCONFIRMED', str(error), session=session, state=state)
|
||||
if proof.get('status') != 'RELEASE_CONFIRMED':
|
||||
return _result('UNCONFIRMED', '缺少独立资源释放证明', session=session, state=state)
|
||||
from .network_path import release_retained_path_leases
|
||||
release_retained_path_leases(proof)
|
||||
return _result('RELEASED', session=session, state=state, proof=proof)
|
||||
|
||||
|
||||
def reconcile_session_record(path, *, evidence_root):
|
||||
with ExitStack() as stack:
|
||||
try:
|
||||
return _reconcile(Path(path), Path(evidence_root), {}, stack)
|
||||
except Exception as error:
|
||||
return _result('UNCONFIRMED', str(error))
|
||||
|
||||
|
||||
def inspect_session_record(path, *, evidence_root):
|
||||
"""Observe process identities without touching the production library."""
|
||||
with ExitStack() as stack:
|
||||
try:
|
||||
return _reconcile(Path(path), Path(evidence_root), {}, stack, release=False)
|
||||
except Exception as error:
|
||||
return _result('UNCONFIRMED', str(error))
|
||||
|
||||
|
||||
def observe_retained_session(path, *, evidence_root, stop=None, progress=None, process=None,
|
||||
observe_only=False):
|
||||
stop = stop if stop is not None else threading.Event()
|
||||
read_only = observe_only if callable(observe_only) else lambda: observe_only
|
||||
observation = Path(path).with_name('observation-' + uuid4().hex + '.json')
|
||||
with ExitStack() as stack:
|
||||
handles = {}
|
||||
while True:
|
||||
observation_only = read_only()
|
||||
try:
|
||||
result = _reconcile(Path(path), Path(evidence_root), handles, stack, release=not observation_only)
|
||||
except Exception as error:
|
||||
result = _result('UNCONFIRMED', str(error))
|
||||
if (not observation_only and process is not None and process.poll() is not None
|
||||
and getattr(process, 'cbb_library', None)):
|
||||
try:
|
||||
from .library_lock import release_retained_library
|
||||
proof = release_retained_library(process.cbb_library, Path(path).parent/'release-proof')
|
||||
if proof.get('status') == 'RELEASE_CONFIRMED':
|
||||
result = _result('RELEASED', '会话记录不可读;由原进程句柄及独立资源证明确认释放',
|
||||
session={'library': str(process.cbb_library)}, proof=proof)
|
||||
except Exception:
|
||||
pass
|
||||
if result['status'] == 'ACTIVE' and not observation_only and not stop.is_set():
|
||||
try:
|
||||
from .residual_sessions import resume_cancelled_startup
|
||||
if resume_cancelled_startup(path, stop=stop):
|
||||
# Cleanup is not release proof. Re-read all held identities
|
||||
# and independently prove the resource release as usual.
|
||||
result = _reconcile(Path(path), Path(evidence_root), handles, stack)
|
||||
except Exception:
|
||||
logging.getLogger(__name__).warning('Retained startup cleanup unavailable', exc_info=True)
|
||||
if result['status'] == 'IDENTITY_CHANGED' and not observation_only:
|
||||
try:
|
||||
from .library_lock import release_retained_library
|
||||
proof = release_retained_library(result['library'], Path(path).parent/'release-proof')
|
||||
if proof.get('status') == 'RELEASE_CONFIRMED':
|
||||
result = {**result, 'status': 'RELEASED', 'identity_changed': True, 'release_proof': proof}
|
||||
except Exception as error:
|
||||
result['detail'] += f';资源释放待确认:{error}'
|
||||
try:
|
||||
result['owned_worker_alive'] = process is not None and process.poll() is None
|
||||
except Exception:
|
||||
result['owned_worker_alive'] = False
|
||||
try:
|
||||
write_session_record(observation, {**result, 'operation_id': result['operation_id'] or 'unknown'})
|
||||
except (OSError, ValueError):
|
||||
logging.getLogger(__name__).warning('Observation journal unavailable', exc_info=True)
|
||||
if progress is not None:
|
||||
try:
|
||||
progress(result)
|
||||
except Exception:
|
||||
logging.getLogger(__name__).warning('Observation callback failed', exc_info=True)
|
||||
if (result['status'] == 'RELEASED' or stop.is_set()
|
||||
or read_only() and result['status'] != 'ACTIVE'):
|
||||
return result
|
||||
if not handles and process is not None and process.poll() is None:
|
||||
stop.wait(1)
|
||||
continue # The exact owned handle survives a failed journal.
|
||||
if not handles and process is None:
|
||||
return result
|
||||
stop.wait(5 if result['status'] in ('UNCONFIRMED', 'IDENTITY_CHANGED') else 1)
|
||||
|
||||
|
||||
def handoff_session(path, *, evidence_root, process=None, progress=None, stop=None, observe_only=False):
|
||||
"""Retain exact handles in memory until the observer independently releases."""
|
||||
key = str(Path(path).absolute()).casefold()
|
||||
try:
|
||||
session = read_session_record(path, evidence_root=evidence_root)
|
||||
library = session['library']
|
||||
except (OSError, ValueError, KeyError):
|
||||
session = {}
|
||||
library = getattr(process, 'cbb_library', None)
|
||||
aliases = {_library_key(library), _library_key(Path(library).resolve())} if library else set()
|
||||
with _observer_guard:
|
||||
if key in _observers:
|
||||
if (observe_only is False and session.get('operation_id')
|
||||
and _retained_results.get(key, {}).get('operation_id') == session['operation_id']):
|
||||
_retained_results[key]['release_operation_id'] = session['operation_id']
|
||||
return
|
||||
_retained_libraries[key] = aliases
|
||||
_retained_results[key] = {'status': 'UNCONFIRMED', 'phase': 'UNCONFIRMED',
|
||||
'library': str(library) if library else None, 'block': session.get('block'),
|
||||
'detail': '正在核对残留会话', 'operation_id': session.get('operation_id'),
|
||||
'observer_initializing': True}
|
||||
def notify(value):
|
||||
with _observer_guard:
|
||||
if _retained_libraries.get(key) is aliases:
|
||||
previous = _retained_results[key]
|
||||
_retained_results[key] = {**previous, **value,
|
||||
'observer_initializing': False,
|
||||
'library': value.get('library') or previous['library'],
|
||||
'operation_id': value.get('operation_id') or previous['operation_id'],
|
||||
'block': value.get('block') or previous['block']}
|
||||
if progress is not None:
|
||||
progress(value)
|
||||
def observation_only():
|
||||
if not observe_only:
|
||||
return False
|
||||
with _observer_guard:
|
||||
value = _retained_results.get(key, {})
|
||||
return not (session.get('operation_id') and _retained_libraries.get(key) is aliases
|
||||
and value.get('operation_id') == session.get('operation_id')
|
||||
and value.get('release_operation_id') == session.get('operation_id'))
|
||||
def observe():
|
||||
result = None
|
||||
try:
|
||||
result = observe_retained_session(path, evidence_root=evidence_root, progress=notify,
|
||||
stop=stop, process=process, observe_only=observation_only)
|
||||
if process is not None and process.poll() is not None:
|
||||
process.close()
|
||||
return result
|
||||
finally:
|
||||
with _observer_guard:
|
||||
if _observers.get(key, (None,))[0] is threading.current_thread():
|
||||
_observers.pop(key, None)
|
||||
if (result and result['status'] == 'RELEASED'
|
||||
and _retained_libraries.get(key) is aliases
|
||||
and _retained_results.get(key, {}).get('operation_id') == session.get('operation_id')):
|
||||
_retained_libraries.pop(key, None)
|
||||
_retained_results.pop(key, None)
|
||||
thread = threading.Thread(target=observe, name='retained-native-session', daemon=True)
|
||||
_observers[key] = (thread, process)
|
||||
thread.start()
|
||||
|
||||
|
||||
def discover_sessions(evidence_root, *, library=None):
|
||||
"""Only our bounded journals are inputs; never execute a stored command."""
|
||||
root = Path(evidence_root)
|
||||
found = []
|
||||
if not root.is_dir():
|
||||
return found
|
||||
visited = 0
|
||||
for folder, directories, files in os.walk(root, followlinks=False):
|
||||
directories[:] = [d for d in directories if not (
|
||||
getattr((Path(folder)/d).lstat(), 'st_file_attributes', 0) & stat.FILE_ATTRIBUTE_REPARSE_POINT)]
|
||||
visited += 1
|
||||
if visited > 10000:
|
||||
break
|
||||
if 'session.json' not in files:
|
||||
continue
|
||||
path = Path(folder)/'session.json'
|
||||
try:
|
||||
value = read_session_record(path, evidence_root=root)
|
||||
completed = False
|
||||
for name in files:
|
||||
if not (name.startswith('observation-') and name.endswith('.json')):
|
||||
continue
|
||||
observation = read_session_record(Path(folder)/name, evidence_root=root)
|
||||
proof = observation.get('release_proof') or {}
|
||||
proof = proof if isinstance(proof, dict) else {}
|
||||
session_scope = value.get('resource_scope')
|
||||
if observation['operation_id'] == value['operation_id'] and (
|
||||
observation.get('status') == 'RELEASED'
|
||||
and _proof_covers_session(proof, value)
|
||||
or observation.get('status') == 'FINISHED'
|
||||
and isinstance(session_scope, dict) and session_scope.get('scope_state') == 'DECLARED'
|
||||
and observation.get('native_release_confirmed') is True
|
||||
and observation.get('worker_exited') is True):
|
||||
completed = True
|
||||
break
|
||||
if completed:
|
||||
continue
|
||||
if library is not None and _library_key(value.get('library', '')) != _library_key(library):
|
||||
continue
|
||||
observed = inspect_session_record(path, evidence_root=root)
|
||||
value = {**value, **observed, 'library': value.get('library'),
|
||||
'block': value.get('block'), 'operation_id': value['operation_id'], 'path': str(path)}
|
||||
except (OSError, ValueError):
|
||||
continue
|
||||
found.append(value)
|
||||
return found
|
||||
|
||||
|
||||
def active_write_records(library):
|
||||
"""Called by the background residual inspector, never by a queue predicate."""
|
||||
with _observer_guard:
|
||||
paths = [Path(key) for key, aliases in _retained_libraries.items()
|
||||
if _library_key(library) in aliases]
|
||||
result = []
|
||||
for path in paths:
|
||||
try:
|
||||
session, state, processes = _session(path, path.parent)
|
||||
if processes:
|
||||
from .residual_sessions import _process_handle, _handle_identity, _force_ownership
|
||||
import win32con, win32event
|
||||
for identity in processes:
|
||||
if identity.get('role') == 'supervisor' or (
|
||||
state.get('phase') not in ('NATIVE_CALL', 'CLOSING', 'UNCONFIRMED')
|
||||
and identity.get('role') not in ('worker', 'helper')):
|
||||
continue
|
||||
try:
|
||||
with _process_handle(identity['pid']) as handle:
|
||||
if win32event.WaitForSingleObject(handle, 0) == win32con.WAIT_OBJECT_0:
|
||||
continue
|
||||
actual = {**_handle_identity(handle), **_force_ownership(handle, identity['pid'])}
|
||||
if any(actual[k] != identity[k] for k in IDENTITY_KEYS if k != 'pid'):
|
||||
continue
|
||||
# A retained caller may be inside Close after the last journal write failed.
|
||||
result.append({**session, 'phase': state['phase'] if state.get('phase') in (
|
||||
'NATIVE_CALL', 'CLOSING', 'UNCONFIRMED') else 'UNCONFIRMED'})
|
||||
break
|
||||
except Exception as error:
|
||||
if getattr(error, 'winerror', None) != 87:
|
||||
result.append({**session, 'phase': 'UNCONFIRMED'})
|
||||
break
|
||||
except (OSError, ValueError):
|
||||
result.append({'phase': 'UNCONFIRMED'})
|
||||
return result
|
||||
@@ -2,19 +2,16 @@
|
||||
from pathlib import Path
|
||||
from threading import Event
|
||||
|
||||
from PySide6.QtCore import QObject, QThreadPool, Signal, Qt
|
||||
from PySide6.QtCore import QObject, QThreadPool, Signal
|
||||
from PySide6.QtWidgets import (QComboBox, QDialog, QFileDialog, QFormLayout,
|
||||
QHBoxLayout, QLabel, QLineEdit, QPushButton, QMessageBox)
|
||||
|
||||
from .workers import ServiceWorker
|
||||
from .backup_notice import MANUAL_BACKUP_NOTICE
|
||||
from . import timed_prompt
|
||||
from ..operation_queue import BatchTaskContext
|
||||
|
||||
|
||||
class RecoverySignals(QObject):
|
||||
progress = Signal(object)
|
||||
choice = Signal(object)
|
||||
|
||||
|
||||
class BackupRecoveryDialog(QDialog):
|
||||
@@ -29,17 +26,11 @@ class BackupRecoveryDialog(QDialog):
|
||||
self.recoverer = recoverer
|
||||
self.native_queue = None
|
||||
self.stop = Event()
|
||||
self.context = None
|
||||
self.ui_job = None
|
||||
self.admit = None
|
||||
self.setWindowModality(Qt.NonModal)
|
||||
self.busy = False
|
||||
self.pool = QThreadPool(self)
|
||||
self.pool.setMaxThreadCount(1)
|
||||
self.signals = RecoverySignals(self)
|
||||
self.signals.progress.connect(self._progress)
|
||||
self._choice_handler = getattr(parent, '_show_version_choice', None)
|
||||
self.signals.choice.connect(self._choice)
|
||||
self.block_combo = QComboBox()
|
||||
self.block_combo.addItems(list(names))
|
||||
self.source_edit = QLineEdit()
|
||||
@@ -52,7 +43,7 @@ class BackupRecoveryDialog(QDialog):
|
||||
self.close_button.clicked.connect(self.reject)
|
||||
self.cancel_queue_button = QPushButton('取消排队')
|
||||
self.cancel_queue_button.setEnabled(False)
|
||||
self.cancel_queue_button.clicked.connect(lambda:self.stop.set())
|
||||
self.cancel_queue_button.clicked.connect(self.stop.set)
|
||||
self.status_label = QLabel(MANUAL_BACKUP_NOTICE + ' 所选备份先在隔离库中验证;安装时旧 Work 仅改名保留。')
|
||||
self.status_label.setWordWrap(True)
|
||||
layout = QFormLayout(self)
|
||||
@@ -94,69 +85,41 @@ class BackupRecoveryDialog(QDialog):
|
||||
except Exception as error:
|
||||
self.status_label.setText(str(error))
|
||||
return
|
||||
if timed_prompt.question(self, '确认从备份恢复',
|
||||
if QMessageBox.question(self, '确认从备份恢复',
|
||||
f'{MANUAL_BACKUP_NOTICE}\n\n目标库:{request.lmc_file}\nCBB:{name}\n来源:{source}'
|
||||
'\n\n将创建用于校验的隔离库副本,校验通过后替换目标工程。确认继续?',
|
||||
QMessageBox.Yes | QMessageBox.No, QMessageBox.Yes) != QMessageBox.Yes:
|
||||
return
|
||||
if self.admit is not None and not self.admit((request, source)):
|
||||
self.status_label.setText('相同任务已提交,未重复执行。')
|
||||
QMessageBox.Yes | QMessageBox.No, QMessageBox.No) != QMessageBox.Yes:
|
||||
return
|
||||
self.busy = True
|
||||
self.context = BatchTaskContext(str(request.lmc_file), targets=(name,), native_policy='external')
|
||||
context = self.context
|
||||
self.stop = context.stop
|
||||
self.stop.clear()
|
||||
self._set_enabled(False)
|
||||
self.status_label.setText('正在准备恢复…')
|
||||
self.started.emit(name)
|
||||
def execute():
|
||||
options = {'version_prompt': lambda choice:self._emit(context, 'choice',choice),'stop':context.stop} if self.recoverer is None else {}
|
||||
action = lambda: recoverer(request, source, progress=lambda event:self._emit(context, 'progress',event), **options)
|
||||
if self.native_queue is None: return context.run(action)
|
||||
action = lambda: recoverer(request, source, progress=self.signals.progress.emit)
|
||||
if self.native_queue is None: return action()
|
||||
from ..operation_queue import QueueCancelled
|
||||
def restore():
|
||||
self._emit(context, 'progress',{'stage': 'queue_acquired'})
|
||||
self.signals.progress.emit({'stage': 'queue_acquired'})
|
||||
return action()
|
||||
try:
|
||||
return self.native_queue.run(restore, stop=context.stop, context=context, waiting=lambda: self._emit(context, 'progress',
|
||||
return self.native_queue.run(restore, stop=self.stop, waiting=lambda: self.signals.progress.emit(
|
||||
{'stage': 'waiting_native_slot', 'detail': '已排队,等待当前检查结束'}))
|
||||
except QueueCancelled as error:
|
||||
from ..operation_queue import TaskHandoff
|
||||
from ..verify_runner import VerifyResult, _handoff_verify_result
|
||||
if isinstance(error, TaskHandoff): return _handoff_verify_result(error)
|
||||
from ..verify_runner import VerifyResult
|
||||
return VerifyResult('CANCELLED', stderr=str(error))
|
||||
self.worker = ServiceWorker(execute)
|
||||
self.worker.signals.succeeded.connect(context.guard_callback(lambda result: self._result(name, result), current=lambda:self.context))
|
||||
self.worker.signals.failed.connect(context.guard_callback(lambda error: self._failed(name, error), current=lambda:self.context))
|
||||
self.worker.signals.finished.connect(lambda:self._finished() if self.context is context else None)
|
||||
self.worker.signals.succeeded.connect(lambda result: self._result(name, result))
|
||||
self.worker.signals.failed.connect(lambda error: self._failed(name, error))
|
||||
self.worker.signals.finished.connect(self._finished)
|
||||
self.pool.start(self.worker)
|
||||
|
||||
def _emit(self, context, signal, value):
|
||||
if context is not self.context or not self.busy or signal == 'choice' and context.stop.is_set():
|
||||
if signal == 'choice': value.choose('cancel')
|
||||
return
|
||||
try:
|
||||
delivered = context.guard_callback(lambda:getattr(self.signals, signal).emit((context,value)) or True)()
|
||||
if not delivered and signal == 'choice': value.choose('cancel')
|
||||
except RuntimeError:
|
||||
if signal == 'choice': value.choose('cancel')
|
||||
|
||||
def _choice(self, payload):
|
||||
context, choice = payload
|
||||
if context is not self.context or not self.busy or context.stop.is_set() or self._choice_handler is None:
|
||||
choice.choose('cancel')
|
||||
return
|
||||
self._choice_handler((self.ui_job,choice) if self.ui_job else choice)
|
||||
|
||||
def _set_enabled(self, enabled):
|
||||
for widget in (self.block_combo, self.source_edit, self.browse_button,
|
||||
self.restore_button, self.close_button):
|
||||
widget.setEnabled(enabled)
|
||||
|
||||
def _progress(self, event):
|
||||
if isinstance(event, tuple):
|
||||
context, event = event
|
||||
if context is not self.context or not self.busy: return
|
||||
if isinstance(event, dict):
|
||||
if event.get('stage') in ('waiting_native_slot', 'queue_acquired'):
|
||||
self.cancel_queue_button.setEnabled(event['stage'] == 'waiting_native_slot')
|
||||
@@ -167,9 +130,6 @@ class BackupRecoveryDialog(QDialog):
|
||||
def _result(self, name, result):
|
||||
if result.status == 'PASS':
|
||||
message = '恢复完成,工程打开与校验通过。'
|
||||
elif result.status in ('SKIPPED', 'CANCELLED'):
|
||||
label = '恢复已跳过' if result.status == 'SKIPPED' else '恢复已取消'
|
||||
message = f'{label}:{result.stderr or result.stdout or result.status}'
|
||||
else:
|
||||
message = f'恢复未通过:{result.stderr or result.stdout or result.status}'
|
||||
if result.evidence_path:
|
||||
@@ -192,7 +152,6 @@ class BackupRecoveryDialog(QDialog):
|
||||
|
||||
def closeEvent(self, event):
|
||||
if self.busy:
|
||||
self.stop.set()
|
||||
event.ignore()
|
||||
else:
|
||||
super().closeEvent(event)
|
||||
@@ -1,7 +1,8 @@
|
||||
"""A check batch owns its snapshot and yields the native queue after each CBB."""
|
||||
from threading import Event
|
||||
from PySide6.QtCore import QObject, QThreadPool, Signal
|
||||
from .workers import ServiceWorker
|
||||
from ..operation_queue import QueueCancelled, BatchTaskContext
|
||||
from ..operation_queue import QueueCancelled
|
||||
from ..verify_runner import VerifyResult, run_verify, write_batch_report
|
||||
from ..icdb_maintenance import write_maintenance_report
|
||||
|
||||
@@ -11,18 +12,14 @@ class IcdbCheckTask(QObject):
|
||||
item_done = Signal(str, object)
|
||||
finished = Signal(object)
|
||||
|
||||
def __init__(self, requests, queue, report_root, *, verifier=None, path_lease=None, parent=None, status_reader=None, choice_prompt=None):
|
||||
def __init__(self, requests, queue, report_root, *, verifier=None, path_lease=None, parent=None):
|
||||
super().__init__(parent)
|
||||
self.requests = tuple(requests)
|
||||
self.queue, self.report_root = queue, report_root
|
||||
self.path_lease = path_lease
|
||||
self.context = BatchTaskContext(str(self.requests[0].lmc_file),
|
||||
targets=tuple(r.block_name for r in self.requests), native_policy='external')
|
||||
self.status_reader = status_reader
|
||||
self.verifier = verifier or (lambda req: run_verify(req, progress=self._emit_event,
|
||||
stop=self.stop, version_prompt=choice_prompt))
|
||||
self.verifier = verifier or (lambda req: run_verify(req, progress=self.event.emit, stop=self.stop))
|
||||
self.results = []
|
||||
self.stop = self.context.stop
|
||||
self.stop = Event()
|
||||
self.active = False
|
||||
self.paused = False
|
||||
self.invalidated = set()
|
||||
@@ -30,15 +27,8 @@ class IcdbCheckTask(QObject):
|
||||
self.running = False
|
||||
self.report = None
|
||||
self.report_error = ''
|
||||
self.retained_libraries = set()
|
||||
self.pool = QThreadPool(self); self.pool.setMaxThreadCount(1)
|
||||
|
||||
def _emit_event(self, event):
|
||||
try:
|
||||
self.context.guard_callback(self.event.emit)(event)
|
||||
except RuntimeError:
|
||||
pass
|
||||
|
||||
def start(self):
|
||||
self.active = True
|
||||
self._next()
|
||||
@@ -63,45 +53,26 @@ class IcdbCheckTask(QObject):
|
||||
|
||||
def _next(self):
|
||||
if self.running or not self.active: return
|
||||
if self.stop.is_set():
|
||||
if self.stop.is_set() or self.results and not self.results[-1].safe_to_continue:
|
||||
self.results.extend(VerifyResult('SKIPPED', stderr='队列已停止,未操作此 CBB')
|
||||
for _ in self.requests[len(self.results):])
|
||||
while len(self.results) < len(self.requests) and str(
|
||||
self.requests[len(self.results)].lmc_file).casefold() in self.retained_libraries:
|
||||
self.results.append(VerifyResult('SKIPPED', stderr='同库原生会话尚未释放,未启动新的检查'))
|
||||
if len(self.results) == len(self.requests):
|
||||
self._report(); return
|
||||
if self.paused: return
|
||||
request = self.requests[len(self.results)]
|
||||
def check():
|
||||
from ..session_record import library_available, library_wait_reason
|
||||
try:
|
||||
def execute():
|
||||
if self.status_reader is not None:
|
||||
statuses = self.status_reader((request.block_name,), request.lmc_file)
|
||||
self.update_statuses(statuses)
|
||||
if statuses.get(request.block_name) == 'NOT_REGISTERED':
|
||||
return VerifyResult('SKIPPED', stderr='仅发现目录,原生目录未登记此 CBB。')
|
||||
if request.block_name in self.ready_names:
|
||||
return VerifyResult('SKIPPED', stderr='工程已为 READY,跳过 ICDB 检查。')
|
||||
if request.block_name in self.invalidated:
|
||||
return VerifyResult('SKIPPED', stderr='目标已有后续管理操作,请重新检查。')
|
||||
self._emit_event({'stage': 'icdb_check_start', 'block': request.block_name})
|
||||
result = self.verifier(request)
|
||||
if not result.safe_to_continue:
|
||||
from ..operation_lifecycle import recheck_failed_release
|
||||
result = recheck_failed_release(request.lmc_file, request.block_name, result)
|
||||
return result
|
||||
return self.queue.run(execute, stop=self.stop, context=self.context,
|
||||
wait_state=lambda: (self.paused, library_wait_reason(request.lmc_file)),
|
||||
ready=lambda: not self.paused,
|
||||
waiting=lambda: self._emit_event({'stage': 'waiting_native_slot', 'block': request.block_name,
|
||||
'library': str(request.lmc_file), 'retained': not library_available(request.lmc_file),
|
||||
'detail': library_wait_reason(request.lmc_file) or '已排队,等待当前原生操作结束'}))
|
||||
self.event.emit({'stage': 'icdb_check_start', 'block': request.block_name})
|
||||
return self.verifier(request)
|
||||
return self.queue.run(execute, stop=self.stop, ready=lambda: not self.paused,
|
||||
waiting=lambda: self.event.emit({'stage': 'waiting_native_slot', 'block': request.block_name,
|
||||
'detail': '已排队,等待当前原生操作结束'}))
|
||||
except QueueCancelled as error:
|
||||
from ..operation_queue import TaskHandoff
|
||||
from ..verify_runner import _handoff_verify_result
|
||||
if isinstance(error, TaskHandoff): return _handoff_verify_result(error)
|
||||
return VerifyResult('CANCELLED', stderr=str(error))
|
||||
except Exception as error:
|
||||
return VerifyResult('FAIL', stderr=str(error), safe_to_continue=False,
|
||||
@@ -113,10 +84,7 @@ class IcdbCheckTask(QObject):
|
||||
self.pool.start(self.worker)
|
||||
|
||||
def _record(self, result):
|
||||
request = self.requests[len(self.results)]
|
||||
name = request.block_name
|
||||
if not result.safe_to_continue:
|
||||
self.retained_libraries.add(str(request.lmc_file).casefold())
|
||||
name = self.requests[len(self.results)].block_name
|
||||
self.results.append(result)
|
||||
if result.status in ('CANCELLED', 'QUEUE_STOP'): self.stop.set()
|
||||
self.item_done.emit(name, result)
|
||||
@@ -134,12 +102,7 @@ class IcdbCheckTask(QObject):
|
||||
return report, ''
|
||||
except Exception as error:
|
||||
return None, str(error)
|
||||
def bounded_write():
|
||||
try:
|
||||
return BatchTaskContext(str(self.requests[0].lmc_file)).run(write, metadata_only=True)
|
||||
except Exception as error:
|
||||
return None, str(error)
|
||||
self.worker = ServiceWorker(bounded_write)
|
||||
self.worker = ServiceWorker(write)
|
||||
self.worker.signals.succeeded.connect(self._report_ready)
|
||||
self.worker.signals.finished.connect(self._complete)
|
||||
self.pool.start(self.worker)
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
@@ -1,27 +1,24 @@
|
||||
"""Explicit preview and asynchronous, checkpointed CBB management batch."""
|
||||
from dataclasses import replace
|
||||
from pathlib import Path
|
||||
from threading import Event
|
||||
|
||||
from PySide6.QtCore import QObject, QThreadPool, Signal, Qt
|
||||
from PySide6.QtWidgets import (QCheckBox, QDialog, QFileDialog, QHBoxLayout, QLabel,
|
||||
QMessageBox, QPushButton, QTableWidget, QTableWidgetItem, QTextEdit, QVBoxLayout)
|
||||
from shiboken6 import isValid
|
||||
|
||||
from .workers import ServiceWorker
|
||||
from .backup_notice import MANUAL_BACKUP_NOTICE
|
||||
from . import timed_prompt
|
||||
from ..management import run_management_batch
|
||||
from ..operation_queue import BatchTaskContext
|
||||
from ..management import run_management_batch, validate_name
|
||||
|
||||
RESULT_LABELS = {
|
||||
'REMOVED': '已移除', 'UPLOADED': '已上传 / 未自动校验',
|
||||
'UPLOADED_VERIFIED': '已上传且校验通过', 'UPLOADED_VERIFY_FAILED': '已上传但校验未通过',
|
||||
'UPLOAD_FAILED': '上传失败', 'RECOVERY_REQUIRED': '需要人工恢复',
|
||||
'BLOCKED': '操作被阻止', 'UNSUPPORTED': '当前环境不支持',
|
||||
'SKIPPED': '已跳过 / 未执行', 'CANCELLED': '已取消',
|
||||
}
|
||||
STAGE_LABELS = {
|
||||
'prepare_identity': '正在检查来源工程文件',
|
||||
'prepare_identity': '正在核对来源工程内容',
|
||||
'catalog_before': '正在核对原生目录', 'baseline': '正在记录中心库内容基线',
|
||||
'stage_source': '正在复制并检查来源工程', 'native_remove': '正在移除',
|
||||
'removed': '原条目已移除', 'native_add': '正在上传', 'uploaded': '上传已确认',
|
||||
@@ -36,13 +33,11 @@ STAGE_LABELS = {
|
||||
|
||||
class ManagementSignals(QObject):
|
||||
progress = Signal(object)
|
||||
choice = Signal(object)
|
||||
|
||||
|
||||
class ManagementDialog(QDialog):
|
||||
completed = Signal(object)
|
||||
before_execute = Signal(object)
|
||||
release_requested = Signal(object)
|
||||
|
||||
def __init__(self, requests, parent=None, *, adapter=None, runner=None, recovery_from=None):
|
||||
super().__init__(parent)
|
||||
@@ -60,16 +55,10 @@ class ManagementDialog(QDialog):
|
||||
evidence_dir=self.template.evidence_dir.parent/'reimport-recovery', **kwargs)
|
||||
self.busy = False
|
||||
self.executed = False
|
||||
self.context = BatchTaskContext(str(self.template.library), native_policy='external')
|
||||
self.stop = self.context.stop
|
||||
self.ui_job = None
|
||||
self.admit = None
|
||||
self.setWindowModality(Qt.NonModal)
|
||||
self.stop = Event()
|
||||
self.pool = QThreadPool(self); self.pool.setMaxThreadCount(1)
|
||||
self.signals = ManagementSignals(self)
|
||||
self.signals.progress.connect(self._progress)
|
||||
self._choice_handler = getattr(parent, '_show_version_choice', None)
|
||||
self.signals.choice.connect(self._choice)
|
||||
self.setWindowTitle({'add': '新增 CBB', 'update': '同名更新 CBB', 'remove': '移除 CBB'}[self.operation])
|
||||
self.resize(850, 450)
|
||||
self.table = QTableWidget(0, 4)
|
||||
@@ -84,9 +73,6 @@ class ManagementDialog(QDialog):
|
||||
self.auto_verify.setVisible(self.operation != 'remove')
|
||||
self.status_label = QLabel(MANUAL_BACKUP_NOTICE + ' 更新会先移除再重新导入,失败时请使用手动备份恢复。')
|
||||
self.status_label.setWordWrap(True)
|
||||
self.release_wait_button = QPushButton('查看残留会话…')
|
||||
self.release_wait_button.hide()
|
||||
self.release_wait_button.clicked.connect(lambda: self.release_requested.emit(self.template.library))
|
||||
self.output = QTextEdit(); self.output.setReadOnly(True)
|
||||
self.output.document().setMaximumBlockCount(2000)
|
||||
self.output.hide()
|
||||
@@ -101,14 +87,13 @@ class ManagementDialog(QDialog):
|
||||
self.execute_button = QPushButton('预览并确认执行…')
|
||||
self.execute_button.clicked.connect(self._execute)
|
||||
self.stop_button = QPushButton('当前项结束后停止'); self.stop_button.setEnabled(False)
|
||||
self.stop_button.clicked.connect(lambda:self.context.stop_after_current.set())
|
||||
self.stop_button.clicked.connect(self.stop.set)
|
||||
self.close_button = QPushButton('关闭'); self.close_button.clicked.connect(self.reject)
|
||||
layout = QVBoxLayout(self)
|
||||
layout.addWidget(QLabel(f'目标库:{self.template.library}'))
|
||||
layout.addWidget(self.table)
|
||||
layout.addWidget(self.sources_button); layout.addWidget(self.auto_verify)
|
||||
layout.addWidget(self.status_label); layout.addWidget(self.release_wait_button)
|
||||
layout.addWidget(self.logs_button); layout.addWidget(self.output)
|
||||
layout.addWidget(self.status_label); layout.addWidget(self.logs_button); layout.addWidget(self.output)
|
||||
buttons = QHBoxLayout()
|
||||
for widget in (self.execute_button, self.stop_button, self.close_button): buttons.addWidget(widget)
|
||||
layout.addLayout(buttons)
|
||||
@@ -157,13 +142,13 @@ class ManagementDialog(QDialog):
|
||||
try:
|
||||
if not requests:
|
||||
raise ValueError('请先选择来源工程。')
|
||||
if hasattr(self.adapter, 'validate_source'):
|
||||
for request in requests:
|
||||
self.adapter.validate_source(request, probe_files=False)
|
||||
# Per-item input errors belong in batch results, so valid rows still run.
|
||||
for request in requests:
|
||||
validate_name(request.name)
|
||||
if request.operation != 'remove' and (request.source is None or not request.source.is_file()):
|
||||
raise ValueError(f'{request.name}:请选择完整来源 PRJ。')
|
||||
if len({(r.partition.casefold(), r.name.casefold()) for r in requests}) != len(requests):
|
||||
raise ValueError('批次包含重复目标名称。')
|
||||
except (OSError, ValueError) as error:
|
||||
except ValueError as error:
|
||||
self.status_label.setText(str(error)); return
|
||||
preview = '\n'.join(f'{r.partition} / {r.name}' + (f' ← {r.source}' if r.source else '') for r in requests)
|
||||
description = ('同名更新会原生移除并重新导入;导入失败需要使用手动备份恢复。' if self.operation == 'update'
|
||||
@@ -172,75 +157,33 @@ class ManagementDialog(QDialog):
|
||||
if self.recovery_from:
|
||||
description = ('将用所选副本替换这些 CBB。操作会先移除原条目,再导入副本;'
|
||||
'导入失败时需要用备份恢复。请确认副本版本。')
|
||||
answer = timed_prompt.question(self, '确认管理操作',
|
||||
answer = QMessageBox.question(self, '确认管理操作',
|
||||
f'{MANUAL_BACKUP_NOTICE}\n{description}\n\n目标库:{self.template.library}\n{preview}\n\n'
|
||||
'确认继续执行?', QMessageBox.Yes | QMessageBox.No,
|
||||
QMessageBox.Yes)
|
||||
QMessageBox.No)
|
||||
if answer != QMessageBox.Yes:
|
||||
return
|
||||
requests = [replace(request, check_previous_release=True) for request in requests]
|
||||
if self.admit is not None and not self.admit(tuple(requests)):
|
||||
self.status_label.setText('相同任务已提交,未重复执行。')
|
||||
return
|
||||
self.context = BatchTaskContext(str(self.template.library), targets=tuple(r.name for r in requests), native_policy='external')
|
||||
context = self.context
|
||||
self.stop = context.stop
|
||||
self.busy = True; self.executed = True
|
||||
self._enabled(False)
|
||||
self.before_execute.emit([r.name for r in requests])
|
||||
def execute():
|
||||
choices={'version_prompt':lambda choice:self._emit(context, 'choice',choice)} if self.runner is run_management_batch or self.recovery_from else {}
|
||||
action = lambda: self.runner(requests, adapter=self.adapter, stop=context.stop,
|
||||
progress=lambda event:self._emit(context, 'progress',event),**choices)
|
||||
if self.native_queue is None: return context.run(action)
|
||||
action = lambda: self.runner(requests, adapter=self.adapter, stop=self.stop,
|
||||
progress=self.signals.progress.emit)
|
||||
if self.native_queue is None: return action()
|
||||
from ..operation_queue import QueueCancelled
|
||||
from ..session_record import library_available, library_wait_reason
|
||||
try:
|
||||
if self.runner is run_management_batch:
|
||||
def item(request, action):
|
||||
return self.native_queue.run(action, stop=context.stop, context=context,
|
||||
wait_state=lambda: library_wait_reason(request.library),
|
||||
waiting=lambda: self._emit(context, 'progress',{'stage': 'waiting_native_slot',
|
||||
'retained': not library_available(request.library),
|
||||
'detail': library_wait_reason(request.library) or '已排队,等待当前原生操作结束'}))
|
||||
return self.runner(requests, adapter=self.adapter, stop=context.stop,
|
||||
progress=lambda event:self._emit(context, 'progress',event), item_executor=item,
|
||||
version_prompt=lambda choice:self._emit(context, 'choice',choice), context=context)
|
||||
return self.native_queue.run(action, stop=context.stop, context=context, waiting=lambda: self._emit(context, 'progress',
|
||||
{'stage': 'waiting_native_slot',
|
||||
'retained': not library_available(self.template.library),
|
||||
'detail': library_wait_reason(self.template.library) or '已排队,等待当前检查结束'}),
|
||||
wait_state=lambda: library_wait_reason(self.template.library))
|
||||
return self.native_queue.run(action, stop=self.stop, waiting=lambda: self.signals.progress.emit(
|
||||
{'stage': 'waiting_native_slot', 'detail': '已排队,等待当前检查结束'}))
|
||||
except QueueCancelled as error:
|
||||
from ..operation_queue import TaskHandoff
|
||||
from ..management import ManagementResult
|
||||
return [ManagementResult(r.operation, r.library, r.name, r.partition, r.source, r.auto_verify,
|
||||
'complete', 'RECOVERY_REQUIRED' if isinstance(error,TaskHandoff) else 'CANCELLED',
|
||||
not isinstance(error,TaskHandoff), str(error)) for r in requests]
|
||||
'complete', 'BLOCKED', True, str(error)) for r in requests]
|
||||
self.worker = ServiceWorker(execute)
|
||||
current = lambda: self.context if isValid(self) else None
|
||||
self.worker.signals.succeeded.connect(context.guard_callback(self._result, current=current))
|
||||
self.worker.signals.failed.connect(context.guard_callback(self._failed, current=current))
|
||||
self.worker.signals.finished.connect(lambda:self._finished() if current() is context else None)
|
||||
self.worker.signals.succeeded.connect(self._result)
|
||||
self.worker.signals.failed.connect(self._failed)
|
||||
self.worker.signals.finished.connect(self._finished)
|
||||
self.pool.start(self.worker)
|
||||
|
||||
def _emit(self, context, signal, value):
|
||||
if context is not self.context or not self.busy or signal == 'choice' and context.stop.is_set():
|
||||
if signal == 'choice': value.choose('cancel')
|
||||
return
|
||||
try:
|
||||
delivered = context.guard_callback(lambda:getattr(self.signals, signal).emit((context,value)) or True)()
|
||||
if not delivered and signal == 'choice': value.choose('cancel')
|
||||
except RuntimeError:
|
||||
if signal == 'choice': value.choose('cancel')
|
||||
|
||||
def _choice(self, payload):
|
||||
context, choice = payload
|
||||
if context is not self.context or not self.busy or context.stop.is_set() or self._choice_handler is None:
|
||||
choice.choose('cancel')
|
||||
return
|
||||
self._choice_handler((self.ui_job,choice) if self.ui_job else choice)
|
||||
|
||||
def _enabled(self, enabled):
|
||||
for widget in (self.table, self.sources_button, self.auto_verify, self.close_button):
|
||||
widget.setEnabled(enabled)
|
||||
@@ -248,11 +191,7 @@ class ManagementDialog(QDialog):
|
||||
self.stop_button.setEnabled(not enabled)
|
||||
|
||||
def _progress(self, event):
|
||||
if isinstance(event, tuple):
|
||||
context, event = event
|
||||
if context is not self.context or not self.busy: return
|
||||
stage = str(event.get('stage', ''))
|
||||
self.release_wait_button.setVisible(stage == 'waiting_native_slot' and bool(event.get('retained')))
|
||||
text = f'{event.get("block", "")} {STAGE_LABELS.get(stage, RESULT_LABELS.get(stage, "正在处理"))}'
|
||||
if stage == 'waiting_native_slot': text = str(event.get('detail', '已排队,等待执行'))
|
||||
self.output.append(str(event))
|
||||
@@ -270,8 +209,8 @@ class ManagementDialog(QDialog):
|
||||
changes = getattr(result, 'change_report', None)
|
||||
if changes:
|
||||
if changes.get('status') == 'RECORDED':
|
||||
text += (f'\n已比对的工程文件:新增 {len(changes["added"])}、删除 {len(changes["deleted"])}、'
|
||||
f'修改 {len(changes["modified"])};范围仅限报告列出的工程文件。')
|
||||
text += (f'\n变更:新增 {len(changes["added"])}、删除 {len(changes["deleted"])}、'
|
||||
f'修改 {len(changes["modified"])} 个主要文件。')
|
||||
else:
|
||||
summary += ',变更清单待核对'
|
||||
text += '\n'+changes.get('detail', '变更清单未确认')
|
||||
@@ -298,7 +237,6 @@ class ManagementDialog(QDialog):
|
||||
request.source, request.auto_verify, 'complete', 'RECOVERY_REQUIRED', False, str(error))])
|
||||
|
||||
def _finished(self):
|
||||
self.release_wait_button.hide()
|
||||
self.busy = False; self._enabled(True)
|
||||
|
||||
def reject(self):
|
||||
@@ -307,6 +245,6 @@ class ManagementDialog(QDialog):
|
||||
|
||||
def closeEvent(self, event):
|
||||
if self.busy:
|
||||
self.context.stop_after_current.set(); event.ignore()
|
||||
self.stop.set(); event.ignore()
|
||||
else:
|
||||
super().closeEvent(event)
|
||||
Loaded 100 of 224 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user