Compare commits

..
Author SHA1 Message Date
阿白叔 6327ad10a2 fix: release private desktop on worker launch failure 2026-11-05 13:56:42 +08:00
阿白叔 1acfbd6374 fix: allow native inspection and backup entry after batch errors 2026-11-05 08:24:53 +08:00
阿白叔 aea6192ef9 fix: narrow cross-item and cross-library blockers 2026-11-05 07:42:49 +08:00
阿白叔 53118bae19 feat: replace automatic ICDB maintenance with batch inspection 2026-11-04 23:40:46 +08:00
阿白叔 beb2b06fdf fix: diagnose PCB startup before ICDB maintenance 2026-11-04 22:53:16 +08:00
阿白叔 4ebe098ef0 feat: open native project history and backup interface 2026-11-04 22:12:24 +08:00
阿白叔 00db1cf5f2 fix: continue released verify batches and bound automation shutdown 2026-11-04 20:51:35 +08:00
阿白叔 477a5a46e3 fix: separate verification and ICDB maintenance with live session leases 2026-11-04 19:16:08 +08:00
阿白叔 2587d33c5a fix: keep maintenance results concise and catalog readable 2026-11-04 17:26:35 +08:00
阿白叔 223655fe00 fix: stabilize ICDB preflight and organize UI into tabs 2026-11-04 17:06:27 +08:00
阿白叔 29959e2988 feat: offer explicit copy recovery after failed ICDB maintenance 2026-11-04 14:16:00 +08:00
阿白叔 e14a864b37 fix: inspect native ICDB occupancy before bounded repair 2026-11-04 12:26:09 +08:00
阿白叔 cb1326688b docs: record reviewed ICDB candidate validation 2026-11-04 10:37:10 +08:00
阿白叔 ef652f3ada fix: guard ICDB diagnostics and exclude READY maintenance targets 2026-11-04 10:27:53 +08:00
阿白叔 8180a8a302 fix: diagnose ICDB before repeatable maintenance repair 2026-11-04 09:14:40 +08:00
阿白叔 c902ffbe9a docs: record frozen ICDB recovery with user-selected PCB version 2026-11-03 18:11:00 +08:00
阿白叔 de952a68d6 fix: inspect addressless ICDB projects and ask for PCB recovery version 2026-11-03 17:42:33 +08:00
阿白叔 c85696080d perf: replace automatic backups with manual backup reminders 2026-11-03 16:44:30 +08:00
阿白叔 7527800128 fix: complete legacy CBB import recovery and guard late native submission 2026-11-03 16:03:14 +08:00
阿白叔 d36b6bcad0 fix: admit linked legacy ICDB projects and explain blocked actions 2026-11-03 13:51:05 +08:00
阿白叔 5eac654c36 docs: record native CRUD frozen acceptance and candidate limits 2026-11-03 13:06:07 +08:00
阿白叔 b26e2f2f62 test: create source fixture for native UIA path admission 2026-11-03 12:54:21 +08:00
阿白叔 9ac2f91dde fix: reject legacy copy paths and surface native Add failures 2026-11-03 12:51:35 +08:00
阿白叔 e915aaa865 feat: enable validated pinned native Add and replacement routes 2026-11-03 12:29:42 +08:00
阿白叔 f21781f170 fix: preserve unknown assets and retained export-copy ownership 2026-11-03 12:24:54 +08:00
阿白叔 55a82fdc5f feat: bind native CRUD to prepared engine identity transactions 2026-11-03 11:54:56 +08:00
阿白叔 89500cbb5f feat: require native EDIF geometry in engineering identity 2026-11-03 11:43:45 +08:00
阿白叔 63f3417f19 feat: capture gated native logical and physical identity evidence 2026-11-03 11:39:38 +08:00
阿白叔 ca84bce24f fix: retain uncertain fixture owners and reject source overlap 2026-11-03 11:27:34 +08:00
阿白叔 b97556dcc1 fix: require owned fixture authority for native Add research 2026-11-03 11:22:27 +08:00
阿白叔 07a9c1eaaf feat: integrate shared native Add worker behind identity gate 2026-11-03 11:11:36 +08:00
阿白叔 f8f2dd53aa docs: record actual maintenance button and user-selected recovery validation 2026-11-03 10:25:59 +08:00
阿白叔 2085ec770f docs: explain pending PCB recovery version decision 2026-11-03 09:55:24 +08:00
阿白叔 d76475a1d7 fix: report pending PCB recovery version without obscuring native repair 2026-11-03 09:54:01 +08:00
阿白叔 99a708b40c fix: distinguish UIA dialog chrome from native consent controls 2026-11-03 09:43:16 +08:00
阿白叔 9806ef8f66 docs: record local-only post-repair consent boundary 2026-11-03 09:37:52 +08:00
阿白叔 aa6684b588 fix: bound post-repair readwrite consent to proven local startup 2026-11-03 09:36:33 +08:00
阿白叔 5a758ee3b6 fix: separate maintenance release from safe queue continuation 2026-11-03 09:18:36 +08:00
阿白叔 b635432cff fix: scope maintenance addresses to selected project and shared stores 2026-11-03 09:16:13 +08:00
阿白叔 4cbca0b5a6 docs: explain explicit maintenance for existing ICDB addresses 2026-11-03 09:15:06 +08:00
阿白叔 e39dc63ded fix: admit explicit ICDB maintenance with preserved address evidence 2026-11-03 09:13:32 +08:00
阿白叔 4f741cd176 docs: record final issue 2 candidate evidence and acceptance gaps 2026-11-02 22:59:50 +08:00
阿白叔 122bafcc7a test: scope deletion safeguard to authorized runtime checkpoints 2026-11-02 22:56:30 +08:00
阿白叔 8e486c1097 fix: bound native edit messages and identify empty IE infrastructure 2026-11-02 22:44:50 +08:00
阿白叔 bb98fe66dd fix: normalize native editor handles before UIA calls 2026-11-02 22:36:23 +08:00
阿白叔 1f69480ed8 fix: preload UIA before native proxies and package timezone support 2026-11-02 22:32:32 +08:00
阿白叔 ffa7e84d43 fix: retain unknown startup windows and expose native dispatch errors 2026-11-02 22:19:59 +08:00
阿白叔 46c3e72364 fix: preserve mapped native paths and retain probe ownership guards 2026-11-02 21:48:40 +08:00
阿白叔 dd1fcea7e2 fix: accept layout-based PCB projects without optional icdb path 2026-11-02 21:19:57 +08:00
阿白叔 797a79c30e feat: add guarded native CBB management and recovery coordination 2026-11-02 21:13:24 +08:00
阿白叔 3415e010ff fix: preserve engineering identity in scoped runtime exclusions 2026-11-02 19:50:26 +08:00
阿白叔 29c154d2ca feat: scope recovery manifests while verifying complete backups 2026-11-02 19:32:07 +08:00
阿白叔 877e3b4c76 fix: wait for native repair project shell and ignore known input indicators 2026-11-02 19:12:12 +08:00
阿白叔 b90a9bbfab fix: allow explicit native repair owner process queries 2026-11-02 18:52:04 +08:00
阿白叔 747ce1add2 feat: scope CBB search selection and maintenance to visible non-READY rows 2026-11-02 18:47:25 +08:00
阿白叔 c823a4b92d fix: fail closed on busy or unconfirmed native repair evidence 2026-11-02 18:27:19 +08:00
阿白叔 aa760c2839 fix: classify ICDB repair outcomes and gate released recovery 2026-11-02 18:14:38 +08:00
阿白叔 44b808b8e2 docs: record approved issue 2 implementation plan 2026-11-02 17:52:50 +08:00
阿白叔 ec78dd722c fix: close owned PCB startup failures before ICDB recovery 2026-11-02 17:40:18 +08:00
121 changed files with 2775 additions and 11631 deletions

No files matched your search

+5 -9
View File
@@ -1,19 +1,15 @@
# CBB 中心库上传后校验工具
当前临时分支的备份策略(2026-11-03):应用不再自动备份中心库或 CBB 工程。新增、替换、移除、校验、ICDB 维护和恢复在执行前提示手动备份;请自行保留可用副本。导入暂存、恢复用隔离验证库和轻量操作证据仍会生成,Mentor 原生 Repair 自身的备份行为保持不变。详见[自动备份检查与调整](docs/releases/2026-11-03-manual-backup.md)。此条优先于下方历史版本的备份说明。
当前临时分支的备份策略(2026-11-03):应用不再自动备份中心库或 CBB 工程。新增、替换、移除、校验、ICDB 维护和恢复在执行前提示手动备份;请自行保留可用副本。导入暂存、恢复用隔离验证库和轻量操作证据仍会生成,Mentor 原生 Repair 自身的备份行为保持不变。详见[自动备份检查与调整](docs/releases/2026-11-03-manual-backup.md)。此条优先于下方历史版本的备份说明。
当前开发版本:**[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)。下方日期记录为历史行为,以本说明为准。
当前补丁:**[v0.2.3-beta.1](docs/releases/v0.2.3-beta.1.md)(Beta 预发布,待现场验收)**,替代 0.2.2-beta.1。数据库所有权或关闭状态不确定时停止批次、保留现场;不自动移走地址文件、接管带锁设计或强杀 PCB 进程树。新增全库 ICDB 维护、同名 CBB 完整备份恢复弹窗及严格的原生复核流程。详见 [v0.2.3-beta.1 发布说明](docs/releases/v0.2.3-beta.1.md)。下方日期记录描述历史版本,以本补丁说明为准。
本目录是独立的 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 工程替代。
当前分支会在目标明确、所有权释放和独占访问证据齐全时尝试一次同版本原生 Repair;操作前请手动备份,共享符号库没有 PRJ 入口时停止并要求人工处理。
## 功能边界
@@ -207,7 +203,7 @@ Mentor 桥耗时需在目标机器另行测量。
- `save.log`:`LICENSE_OK / SAVE_OK / IS_SAVED / POST_SAVE_SYNCHRONIZED / CLOSE_OK / QUIT_OK`;
- `result.json`:状态、中心库标志读取结果、阻断原因;
- `image-status-map.json`:按中心库路径隔离的本机动态 `image_id` 校准快照(当前格式 `schema_version=2`);旧版本或无版本缓存会自动忽略并重新校准,日志会记录当前样本、缓存样本、Ready 主 ID、未映射 ID 和逐项决策原因;
- `backup/`:历史版本的辅助文件副本;当前分支不再生成,所有路径记录 `backup_skipped / manual_backup_policy`。已有历史副本不由本轮改动清理。
- `backup/`:历史版本的辅助文件副本;当前分支不再生成,所有路径记录 `backup_skipped / manual_backup_policy`。已有历史副本不由本轮改动清理。
超时采用无进展计时:界面和批量请求默认 600 秒无进展超时;它不是整个 CBB 的固定总时限,而是连续 600 秒没有可观察进展时才终止。PCB/COM 阶段切换、Project Integration 状态变化、保存标记变化和弹窗处理都会刷新计时器;重复的状态轮询不算进展。需要更快失败时仍可在界面将单项预算调低,但 30 秒只适合已确认 PCB 启动稳定的环境。
+1 -37
View File
@@ -1,40 +1,4 @@
# CBB 检查、校验、管理与残留释放操作规程
适用开发版本:0.2.4b1。未完成现场验收,不自动发布或关闭工单。以下为当前规程,下方旧上传校验检查表保留为历史参考。
## 当前操作与队列
选择中心库 `.lmc`,核对 CBB 名称、分区及完整 PRJ/PCB 工程。写操作和人工修复前由操作员保存可用一致备份;应用不自动备份整个中心库,隔离验证/暂存副本不代替人工备份。
普通校验完成原生打开、身份确认、Project Integration、保存和关闭后,必须由权威状态 READY/raw=1 确认成功。ICDB 检查仅尝试打开并检查本次错误,不自动 Repair、Restore 或选择版本,CHECKED 不等于 READY。排队期间变成 READY 的工程在执行前跳过。
原生任务串行排队,检查每项结束后让出机会;缓存筛选保持可用。失败项确认释放后继续独立项目;实际未释放时停止后续原生操作。“停止检查”只取消检查,“取消当前任务并停止队列”同时取消前台任务及后续后台检查,已进行的写入等待安全结束,不强杀代替取消。
新增拒绝同名冲突;更新先原生移除再导入,失败可能需要人工备份恢复;移除后重新读取目录确认。版本回退由操作员在原生界面选择,核对工程内容后单独校验。
## 历史记录、操作结果与报告
校验和管理遇到历史释放记录时,先复核实际进程、地址、独占文件及导出副本。确认释放后归档记录再继续,不以历史 JSON 本身判定真实占用;同目标未完成写入仍需核对,不自动重放。释放证明在管理首次原生调用前写入检查点,并在结果中保留。
管理操作生成目标工程、库配置和共享依赖的写前/写后主要文件清单及新增、删除、修改差分;不增加自动全库备份,也不声称检查了其他 CBB 内容。报告不可用与原生操作失败分别记录;本任务已释放时可继续独立项。
## 默认释放与单独确认的强制客户端操作
1. 停止新任务,预览当前库的工程、程序、PID 和历史记录。默认“确认释放”仅正常关闭作用域及当前身份已确认的客户端。未保存更改由操作员选择保存、放弃或保留;未知提示保持现场。
2. 数据库服务器可能服务同库其他用户。本工具不允许强制结束服务器,命令行指向本库也不构成独占授权;由库管理员核对用户和服务器状态。
3. “强制结束客户端”是另行确认的异常处理,只允许属于当前 Windows 用户和会话、已确认作用域和精确进程身份的 Expedition PCB、Library Manager、viewdraw、iCDB Project Backup 客户端。后台导入器、脚本宿主和归属未知的进程同样不在强制名单。
4. 警告明确告知客户端中其他已打开工程可能一并退出、未保存更改会丢失、写入中的工程可能需要恢复。执行前持久保存库外 `consent.json`,包含目标库、名单、创建身份和排除项;写入失败不执行。派发处核对快照身份和原预览范围,最终句柄处核对创建时间、完整映像、用户 SID、Windows 会话和原生活动;变化时拒绝。
5. 预览和执行前检查进度与本轮 Output。Backup/Restore/Repair 进行中或状态无法确认时,不强制结束。可查看后台窗口的标题、输出和所在桌面;仅当当前窗口唯一存在已识别的 Cancel/取消按钮时,提供单独确认的原生取消。核对身份、用户会话和按钮快照后发送请求,再重新检查实际结果;没有识别到按钮时不猜菜单参数,不抢占前台。
6. 每项动作前后持久记录实际结果,异常保留已完成/未执行项。若最终记录保存失败但独立库释放证明已确认,界面明确提示记录失败并接受释放事实,不伪造新的占用。
7. 客户端退出仅证明进程结束,不表示修复成功或 READY。服务器仍活跃或库状态未知时保留 PARTIAL、检查点和映射。只有完整的独立释放证明才解除匹配的历史记录;空进程列表本身不是释放证明。
## 失败、证据和回退
保留原生错误、操作员、Mentor 版本、库/工程身份和证据目录;原生日志上传前脱敏。不得删除原生地址/锁文件或修改 LMC 伪造状态。强制客户端退出不可撤销;工程恢复依靠人工一致备份或原生历史版本,不自动回退共享库或重放写操作。
程序回退须先关闭当前客户端,再运行此前候选包;它不恢复丢失更改或被中断的原生事务。工程恢复另行在隔离副本验证,保留前后证据并重新校验。Windows 10、共享库跨机器并发和现场服务器失联恢复仍待验收,fake 测试和文件头损坏试验不代替现场验收。
## 历史上传校验检查表
# CBB 中心库上传后校验操作规程
## 1. 输入与证据
-12
View File
@@ -8,18 +8,6 @@
操作前正常关闭使用相同库的 PCB、Library Manager、原理图/符号编辑客户端,核对原服务器会话已结束,保留包含数据库、原备份和日志的完整一致副本。以下写入先在副本上进行。
## 残留客户端与共享服务器
0.2.4b1 的默认检查、校验、取消和释放流程不会强杀原生会话。操作员可以在独立确认界面强制结束属于当前 Windows 用户和会话、名单中的受支持客户端;这会影响该客户端内其他已打开工程,未保存更改可能丢失,属于异常退出处理,不能替代 Repair。
ICDB 数据库服务器即使命令行指向当前中心库,也可能服务其他用户,**本工具不允许强制结束服务器**。归属未知的进程、后台导入器和脚本宿主同样不允许强制结束;由库管理员核对用户和服务器状态后处理。
强制客户端动作必须先在库外证据目录持久写入确认名单、库和进程创建身份,再核对当前进程句柄、用户 SID 和 Windows 会话;记录失败或身份变化时不执行。客户端结束后仍需独立证明库已释放,重新打开工程并核对版本,必要时从人工一致备份或原生历史版本恢复。不能把“进程已结束”解释为“ICDB 已修复”。具体步骤见 [操作规程](../SOP.md)。
原生 Backup/Restore/Repair 进行中时不强制结束。释放预览可查看后台桌面上的原生输出;只有当前窗口唯一可识别的取消按钮才提供确认请求,发送后仍需重新检查是否停止。输出或取消按钮无法确认时保留现场,不猜测原生命令。
## 原生工程数据库 Repair
1. 启动本机的 iCDB Project Backup,并打开实际报错工程对应的 `.prj`。本机可用 PowerShell 命令形式如下,工程路径需替换为自己的隔离副本:
@@ -1,366 +0,0 @@
# CBB 中心库上传后校验工具(cbb-refresh-verify-795)全面扫描与阻塞分析
- **扫描对象**:`https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795`
- **默认分支**:`main` @ `39985f7`(`chore: release v0.2.3-beta.1`,2026-10-29)
- **活跃分支**:`codex/temp-issue-2-icdb-recovery` @ `29959e2`(2026-11-04 14:16,领先 `main` **49 个提交 / +13,173 行**,未合并、未发布)
- **标签**:`r4-stability-20260929`、`v0.2.2-beta.1`、`v0.2.3-beta.1`
- **扫描时间**:2026-11-04
- **扫描方式**:全量克隆 + 逐模块源码阅读(38 个源文件 / 8,180 行)+ 两个分支完整 pytest + 32 位桥 PE 导入表解析与实机启动 + 关键判定函数行为探针 + 与 `docs/` 现场记录交叉核对
---
> 关联工单:<https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/issues/4>
>
> 扫描基准:`main@39985f7`(v0.2.3-beta.1)、`codex/temp-issue-2-icdb-recovery@29959e2`。
> 本文是扫描时的静态与实测记录;修复进展以工单和后续 PR 为准。
## 0. 一页结论
1. **单机、Win11、有 32 位状态桥、CBB 无异常** 的条件下,`v0.2.3-beta.1` 的"ReusableCircuit PCB → Project Integration → Save/Close → `IsVerifiedReuseBlock` READY"链路是成立的(发布说明有隔离实机 PASS 记录),工具没有伪造绿色状态,失败即阻塞的设计方向正确。
2. **批量场景是这个工具真正的短板**:状态判定依赖外部 32 位桥,但**桥的 x86 VC++/MFC 运行时不随包提供**(本机实测 `0xC0000135` 无法启动);没有桥时工具仍会对每个 CBB 做完整刷新再判 FAIL;叠加"未知弹窗即停批""残留 `sAddress.adr` 即阻断""本机任何 PCB 打开即拒跑",批量任务在现场高概率中途停止。
3. **Win10 是明确的未验收边界**:LM 原生菜单在私有桌面上不派发 MFC 命令(`docs/API-FINDINGS.md`),直接 PCB 路线在 Win10 上是否会提交 Verify 状态没有现场证据。
4. **共享中心库并发没有真正的互斥**:`main` 只有进程内 `Local\` 命名互斥 + 本机进程探测;另一台机器/另一个工程师同时操作同名 CBB 时无任何防护。活跃分支新增了 sidecar 库锁,但它是"合作式"文件锁,Mentor 本身不参与。
5. **ICDB 失联修复尚未闭环**:分支已经做到"原生 Repair → 重开 → 历史版本选择 → 校验 → READY",但文档明确"服务器会话失联经实际按钮触发的完整链路仍需通过",并且出现过"Repair 后 BackAnnotate 被原生拒绝"的失败结论。
6. 代码质量整体高于同类现场工具(分层清晰、证据链完整、失败关闭),但存在若干**可复现的功能缺陷**(内容检查文本误判、`.prj` 编码假设、超时后孤儿 worker、save helper 无超时等),详见第 3 节。
**一句话**:这个工具现在能"证明一个 CBB 是否真的绿",但还不能稳定地"把一批 CBB 刷成绿";阻塞点不在算法,而在**判定链的部署完整性、现场弹窗/占用环境、以及批量的工程化**。
---
## 1. 系统定位与运行链路
### 1.1 定位
| 项 | 内容 |
| --- | --- |
| 处理对象 | 已上传到 Mentor 中心库(`.lmc` + `ReusableBlocksLP`)的 CBB 条目 |
| 核心动作 | 打开该 CBB 的 ReusableCircuit PCB → Project Integration 四项同步 → 保存 Reusable Block cell → 关闭 → 只读读取权威 Verify 状态 |
| 不做什么 | 不做 Part Number 替换、不做上传、不直接改写中心库数据来伪造绿色 |
| 成功判据 | `worker` 完成 + 32 位桥 `IsVerifiedReuseBlock` 返回 `READY / raw=1`,二者缺一即 FAIL |
### 1.2 主链路(`main`)
```
GUI (ui/main_window.py)
└─ run_batch (verify_runner.py) # 串行,max_workers=1
└─ run_verify # 会话级互斥 Local\CbbRefreshVerify795
├─ preflight # Work 下唯一 PRJ / PCBDesignPath / 链接越界
├─ unreleased_addresses # sAddress.adr 残留即 BLOCKED
├─ ReuseBlockImporter -chkContents # 可选:LibSpec + DMS 登录配置
├─ icdb_ports_bindable # 10000-10100 端口预检
├─ DesktopWorker (私有桌面) # 32 位桥/弹窗代理同桌面
│ └─ execute_job (mentor_adapter.py)
│ ├─ 备份(仅本地盘) / CentralLibrary 路径修正
│ ├─ ExpeditionPCB.exe <pcb> -ReusableCircuit
│ ├─ wait_for_target_document (COM 身份核对)
│ ├─ refresh_integration (四项 InSynch)
│ └─ cscript save_verified_block.vbs (Validate/Save/IsSaved/Close/Quit)
├─ cleanup_verify_processes # 只观察退出,不强杀
└─ IsVerifiedReuseBlock (status_bridge.py) → READY / PENDING / UNAVAILABLE
```
对话框监督是一条独立链路:`DesktopWorker` 在私有桌面启动 `--dialog-agent` 伴生进程,agent 用 Win32 + UIA 抓窗口快照,`dialog_supervisor` 按 `assets/dialog_rules.v1.json` 的**阶段化白名单规则**决策,通过 JSONL loopback IPC 回传。
### 1.3 每次校验的产物
`evidence/verify-*/`:`result.json`、`events.jsonl`、`dialogs.jsonl`、`save.log`、`performance.json`、`bridge-status.json`、`diagnostics/`(preflight、native-logs、icdb-recovery)、失败时的 `recovery-required.json`。
### 1.4 现场自述的验证状态(文档)
- `v0.2.3-beta.1`:`pytest` 471 passed;EE7.9.5 隔离实测"破坏 ICDB 文件头 → 备份恢复 → 重新打开 → PASS/GREEN/READY"。
- 明确未验收:Win10、真实网络库大批量、现场 ICDB 失联的自动 Repair 全链路。
- 旧批次 68 项中 51 PASS / 17 FAIL,失败类型已在 `docs/2026-09-29-stability-r4.md` 分类。
---
## 2. 规模与结构
| 指标 | main | temp-issue-2 分支 |
| --- | --- | --- |
| 提交数(相对 main) | — | +49 |
| 源文件 / 行数 | 38 / 8,180 | 47 / 约 13,000+ |
| 测试文件 / 行数 | 35 / 5,752 | 约 50 / 9,000+ |
| 测试用例 | 471 | 1,196 |
| 本机 pytest 结果 | **463 passed / 8 failed** | **1,178 passed / 18 failed** |
| Python / 依赖 | 3.12 + PySide6 6.11 + pywin32 + pywinauto + Pillow | 同 main |
| 打包 | PyInstaller onedir(`CbbRefreshVerify-Background`) | 同 main |
> 本机失败均与环境有关(未完成 `pip install -e .`、无 Mentor 安装、缺 x86 VC 运行时、长路径/编码),不是断言暴露的产品逻辑失败。具体归类见第 7 节。
---
## 3. 功能性问题清单
严重度:**P0** 阻塞交付 / 数据安全风险;**P1** 现场高概率失败或明显功能缺陷;**P2** 可用性、可维护性、规模化问题。
### 3.1 判定链与证据
| 编号 | 严重度 | 问题 | 代码证据 | 影响 |
| --- | --- | --- | --- | --- |
| **F-01** | P0 | **状态桥不可用时仍执行完整刷新,最后才判 FAIL**。批量入口不检查桥是否可用;桥只在 worker 成功后才查询 | `verify_runner.py:981-1000`;UI 读库 `ui/main_window.py:63-68`;`batch_status.authoritative_status_map` 失败只返回 `UNAVAILABLE` | 每个 CBB 白做 2-10 分钟原生刷新 + 一次 Save/Close,然后 `BRIDGE_UNAVAILABLE`;3000 项批量等于 3000 次无效写库 |
| **F-02** | P0 | **32 位状态桥依赖 x86 `mfc140/MSVCP140/VCRUNTIME140`,打包清单只带 exe、未声明或检测该运行时**。本机 SysWOW64 无 x86 运行时,桥启动即 `0xC0000135`(发布 ZIP 不在仓库中,需在发布包上复核是否另行分发) | `packaging/CbbRefreshVerify.spec:4-14` 仅 `binaries=[CbbStatusBridge32.exe]`;PE 导入表实测:`KERNEL32, mfc140, MSVCP140, VCRUNTIME140, api-ms-win-crt-*` | 未额外安装 VC++ 2015-2022 x86 运行时的机器,桥永远不可用 → 所有项最终 FAIL |
| **F-03** | P1 | 内容检查结果用正则 `failed\|error\|cannot connect\|bad data` 判失败,**"0 errors"、路径含 `error` 也会判 FAIL** | `verify_runner.py:30-31, 128-141`;本机实测 `classify_output(0, "...successfully! 0 errors...") == 'FAIL'` | 内容检查偶发误报阻断,且现场难以看出是文本匹配导致 |
| **F-04** | P1 | `preflight` 用 `read_text(encoding='utf-8', errors='replace')` 解析 `.prj`;UTF-16/ANSI 工程会读不到 `PCBDesignPath` → 误判"工程没有 PCBDesignPath" | `verify_runner.py:157-161`;对照 `backup_recovery._project_text`(`backup_recovery.py:129-136`)已正确区分 UTF-16/UTF-8/mbcs | 老工程/修复后工程被预检直接判 BLOCKED,且看起来像"工程数据坏了" |
| **F-05** | P1 | 内容检查报告写入**中心库目录** `LogFiles/`;写失败只拼进局部 `stderr`,PASS 路径下该信息被丢弃 | `verify_runner.py:688-693` | 只读共享/权限不足时无任何提示;中心库额外产生日志文件 |
| **F-06** | P2 | 备份只在 PASS 且 `safe_to_continue` 时清理;失败项 `backup/`(可能数 GB)永久保留,无保留策略 | `verify_runner.py:641-651`;`mentor_adapter.cleanup_evidence_backup` | 长时间批量后磁盘被失败证据占满 |
### 3.2 现场自动化(弹窗 / 桌面 / 进程)
| 编号 | 严重度 | 问题 | 代码证据 | 影响 |
| --- | --- | --- | --- | --- |
| **F-07** | P0 | **任何不在白名单里的弹窗 = `UNKNOWN_DIALOG` = 当前项 FAIL + 整批停止**。规则要求精确英文文本、`GXWND`+`Button` 类名 | `dialog_rules.py:216-236`、`188-236`;`dialog_supervisor.py:458-471` | Mentor 版本/语言/主题差异、任何新提示("Reusable block already exists""license checkout failed"…)都会中断整批;现场 6 项 IME 语言栏误判即此类 |
| **F-08** | P1 | 弹窗代理客户端**每请求 2 秒超时**,而 agent 端 `capture()` 最坏为"N 个窗口 × 0.75s UIA + 子控件枚举";UIA 探测超时后线程泄漏继续跑 | `dialog_agent.py:383-388`(默认 2.0s)、`dialog_probe.py:37-44, 242` | 机器繁忙/窗口多时 `DIALOG_PROTOCOL_TIMEOUT` 被当成致命错误;泄漏的 STA 线程与主探测并发调用 UIA,进一步拖慢 |
| **F-09** | P1 | **Win10 私有桌面上 UIA `InvokePattern` 只关闭原生菜单、不派发 MFC 命令**;`native_lm_verify` 默认关闭,只有显式勾选才走菜单路线 | `docs/API-FINDINGS.md` §7、README「Win10/Win11 兼容性边界」;`verify_runner.py:466-470` | Win10 现场两条路线都不保证成功;目前只能以"Win11 已验证"交付 |
| **F-10** | P1 | **本机只要有任何 `ExpeditionPCB.exe` 在跑就拒绝校验**(即使与本 CBB 无关) | `mentor_adapter.py:619-621` | 工程师日常开着 PCB 时无法点击校验;现场"先关掉所有 PCB"成为隐性前置条件 |
| **F-11** | P1 | `sAddress.adr` 任一残留即 `ICDB_SESSION_UNCONFIRMED` 阻断;正常/异常退出后残留都要人工处理 | `icdb_ownership.py:13-16`;`mentor_adapter.py:644-650`;`verify_runner.py:661-670` | 一次现场崩溃会让后续每次校验都失败,且错误信息指向"未释放",与真实原因(陈旧文件)难区分 |
| **F-12** | P1 | save helper 轮询循环**无超时、无取消检查**;helper 卡在 `doc.Save()` 时 worker 只能等监督器 600s 空闲超时 | `mentor_adapter.py:794-816` | 网络库/许可异常时单次长时间挂起;超时后 helper 仍可能继续写 |
| **F-13** | P0 | **超时/取消只"请求停止"(touch 取消文件),不终止 worker**;worker 只在启动前、PCB 启动循环、保存前 3 处检查取消 | `desktop_worker.py:149-157`;`mentor_adapter.py:684-689, 744-746, 787-789`;`verify_runner.py:892-903` | 监督器已返回 TIMEOUT/FAIL 并释放互斥;worker 仍可能在随后的几秒内完成 Save/Close。若清理时恰好观察到 PCB 已退出,会判定 `safe_to_continue=True` 并启动下一项,而上一项仍可能有迟到的原生写入 |
| **F-14** | P1 | supervisor 崩溃看门狗在 `cancel_path` 存在时(**生产总是存在**)只写取消文件然后返回,**不退出 worker**;只有 `cancel_path=None` 才 `os._exit(75)` | `desktop_worker.py:34-52`;`verify_runner.py:724` 恒写入 `cancel_signal` | 与 F-13 叠加:父进程崩溃后可能留下无监督的自动化进程继续写库 |
### 3.3 数据、权限与边界
| 编号 | 严重度 | 问题 | 代码证据 | 影响 |
| --- | --- | --- | --- | --- |
| **F-15** | P1 | 工具会**改写中心库内 `PCB/pcb.prj` 的 `CentralLibrary`**;修改前只在本次证据目录留单文件副本,网络库不做整工程备份 | `mentor_adapter.py:93-162, 707-712`;README 第 22 行亦承认 | 现场(网络中心库)没有可回退的工程副本;与 README「不允许直接改写中心库 .prj」的表述冲突 |
| **F-16** | P2 | `Work` 下 `.prj` 不唯一即预检跳过;修复/导入后残留的备份 PRJ 会被当作"无法唯一确定" | `verify_runner.py:152-155`;`preflight_skip_reason` | 条目被静默跳过(黄行),用户以为已校验 |
| **F-17** | P2 | Cert 完全不参与判定(设计取舍),但也没有"保存成功但未提交"的独立证据维度 | `verify_runner.py:313-330`;`collect_cert_evidence` 仅记路径 | 只能靠桥区分 PASS/PENDING;桥抖动时无法自证 |
| **F-18** | P2 | 备份策略:网络盘直接跳过递归备份(`backup_skipped`),本地盘 3-30s 预算 | `mentor_adapter.py:632-640, 399-453` | 现场中心库基本都在网络盘 → 实际上没有前置备份 |
### 3.4 性能与规模化
| 编号 | 严重度 | 问题 | 代码证据 | 影响 |
| --- | --- | --- | --- | --- |
| **F-19** | P1 | 每次"读取 CBB"都会:整文件 SHA-256 `.lmc` + 顶层目录指纹 + 逐 CBB 桥查询 + **逐 CBB `preflight_skip_reason`(网络 stat/glob/读 PRJ)** | `batch_status.py:95-122, 194-197`;`ui/main_window.py:257-263` | 3000 项网络库首屏可能数分钟到数十分钟;期间只有一个"正在读取中心库…"标签,无进度、不可取消 |
| **F-20** | P1 | 批量无进度条(仅全库 ICDB 模式有)、**不能取消当前项**(只能"当前项完成后停止")、崩溃后队列不持久化、不续跑 | `ui/main_window.py:417-454, 547-548`;`run_batch` 只在项间检查 stop | 长批次一旦中断只能从头再来;现场无法预估剩余时间 |
| **F-21** | P2 | 每次桥查询(单条路径)都新起一个 32 位进程;批量依赖常驻 `--server`,桥崩溃后整段剩余项直接标 UNAVAILABLE | `status_bridge.py:141-203, 206-332`;`batch_status.py:258-270` | 单条校验慢;桥异常时"剩余全部不可用",无法只重试当前项 |
| **F-22** | P2 | 多处 0.2s 轮询叠加 WMI 查询(`Win32_Process` 每次约 50-200ms)、integration 每次 `native_error()` 读 3 个原生日志 | `mentor_adapter.py:744-761, 800-809`;`integration.py:33-39`;`post_verify_diagnostics.py:32-39` | CPU/网络 I/O 放大;网络日志读取可能反过来拖慢原生操作 |
### 3.5 工程性 / 可维护性
| 编号 | 严重度 | 问题 | 证据 |
| --- | --- | --- | --- |
| **F-23** | P2 | 38 个源文件里 **102 处** `except Exception`/裸 `except`,大量 `except: pass`;故障常被降级成 `UNKNOWN/FAIL`,根因只留在日志 | 静态统计 |
| **F-24** | P2 | GUI/CLI 顶层异常只 `return 1`,不打对话框、不打印到控制台;批处理用户只看到退出码 | `application.py:134` |
| **F-25** | P2 | 无 CI 配置、无 lint/类型检查、无 LICENSE/CHANGELOG;300KB 二进制入库;`.gitattributes` 全量 `-text` | 仓库根目录 |
| **F-26** | P2 | 测试依赖"本机已 `pip install -e .` + 已装 Mentor + 有 x86 运行时",新克隆机器直接 pytest 会有 8 项环境失败 | 第 7 节 |
| **F-27** | P2 | 分支 49 个提交、+13k 行,`pyproject.toml` 版本仍是 `0.2.3b1`,候选包与正式包同版本号 | `pyproject.toml:6`(两分支相同) |
---
## 4. 阻塞点划分(任务视角)
把"阻塞"分成三类,避免把平台限制、工程缺陷、规模问题混在一起:
- **K1 平台/产品硬约束**:Mentor/Windows 决定,改代码无法消除,只能绕行、限定验收范围或推动替代方案。
- **K2 交付阻塞**:团队可修,但当前版本不满足"可交付/可批量"的最低条件。
- **K3 规模化阻塞**:单机少量可用,上批量/上团队前必须解决。
### 4.1 阻塞点总表
| 编号 | 阻塞点 | 类型 | 证据 | 受影响任务 | 解除条件 | 优先级 |
| --- | --- | --- | --- | --- | --- | --- |
| **K1-1** | Library Manager 没有公开的 CBB `Verify()` COM 方法,只有内部 32 位导出 | K1 | `docs/API-FINDINGS.md` §3;`LibraryManager.tlb` 审计 | 所有"编程触发 Verify"的路线 | 接受"只读判定 + ReusableCircuit 刷新"路线,或继续 ABI 研究 | — |
| **K1-2** | 状态判定只能靠 32 位 MFC ABI 桥,64 位 Python 不能直连 | K1 | `docs/API-FINDINGS.md` §3、§9 | 状态读取 | 保持独立 x86 桥(现状) | — |
| **K1-3** | 私有桌面上 LM 原生菜单不派发(Win10 UIA),`SwitchDesktop` 在本机不可用 | K1 | `docs/API-FINDINGS.md` §7 | Win10 现场 | 现场 Windows 10 真机验收;或限定仅 Win11 | — |
| **K1-4** | iCDB 服务器端口必须落在 10000–10100,可能被 Hyper-V/WSL 保留 | K1 | `mentor_adapter.py:978-1082`;文档 §8 | 所有 PCB 启动 | 管理员 `net stop winnat && net start winnat`(工具已给提示) | — |
| **K1-5** | Mentor 对"已验证工程"禁止 BackAnnotate;共享符号库没有 PRJ 入口 | K1 | 工单 #2 文档、`integration.py:93-100` | 已绿工程复检、共享库修复 | 按原生限制记录为"已同步/不支持",或人工处理 | — |
| **K2-1** | **桥不可用(缺 x86 运行时 / 未打包 / 路径找不到)仍可启动批量** | K2 | F-01、F-02 | 全部批量 | 打包 `VC_redist.x86` 或 `/MT` 静态链接;启动自检;无桥禁止批量 | **P0** |
| **K2-2** | **未知弹窗即停批**,白名单覆盖不了现场提示 | K2 | F-07 | 批量、Win10 | 规则分级(致命/可确认/仅记录)、未知弹窗可配置停机或继续并留证 | **P0** |
| **K2-3** | **超时/取消不终止 worker,孤儿进程可能继续写库** | K2 | F-13、F-14 | 数据安全、连续批量 | 明确"取消=停自动化客户端、保留原生会话"的边界;对 worker 进程做可验证的终止/对账;看门狗在崩溃时真正退出 | **P0** |
| **K2-4** | 共享中心库无跨机互斥;`main` 只有进程内互斥 + 本机 PCB 探测 | K2 | `verify_runner.py:504-547, 742-746`;分支 `library_lock.py` | 多人/多机使用 | 合并分支库锁并让上传工具/Mentor 侧协同;或规定"单人独占窗口" | **P1** |
| **K2-5** | 残留 `sAddress.adr` 永久阻断;本机任意 PCB 打开即拒跑 | K2 | F-10、F-11 | 日常使用 | 区分"陈旧地址文件"与"活会话"(探测可达性已具备,但策略过严);PCB 占用按 CBB/工程匹配而非全局 | **P1** |
| **K2-6** | ICDB 失联的自动 Repair 全链路未验收;Repair 后 BackAnnotate 被拒 | K2(分支) | `docs/releases/2026-11-03-field-feedback.md`、`2026-11-04-icdb-review-fixes.md` | 库损坏恢复、全库维护 | 现场真实失联库端到端验收;修复后重开/保存/READY 全绿 | **P0(分支)** |
| **K2-7** | Win10 未验证,且没有可用的菜单触发兜底 | K2 | F-09 | Win10 现场 | Win10 真机单 CBB 验收,或书面限定 Win11 | **P1** |
| **K2-8** | 内容检查文本误判 + `.prj` 编码假设 | K2 | F-03、F-04 | 启用内容检查的批次 | 修正解析/判定,补回归 | **P1** |
| **K3-1** | 首屏扫描 O(全库) + 逐 CBB 预检,无进度/不可取消 | K3 | F-19 | 3000 项批量 | 增量扫描、缓存指纹、预检并行/惰性、进度条 | **P1** |
| **K3-2** | 队列不持久化、不能取消当前项、无断点续跑 | K3 | F-20 | 长批次 | 队列清单落盘 + 逐项检查点 + 取消当前项 | **P1** |
| **K3-3** | 失败证据/备份无上限 | K3 | F-06 | 长期运行 | 证据保留策略(按天/按大小) | **P2** |
| **K3-4** | 质量门禁缺失(无 CI、版本号不变、环境耦合) | K3 | F-25、F-26、F-27 | 发布/回归 | CI(无 Mentor 的 mock 层 + 一台 Mentor 自托管 runner)、版本号规范 | **P2** |
### 4.2 任务可达性矩阵
| 任务场景 | 结论 | 关键阻塞 |
| --- | --- | --- |
| 单 CBB,Win11,本地/网络库,桥可用,无人占用 | ✅ **可用**(有隔离实机 PASS 记录) | 无 |
| 单 CBB,桥不可用/未装 x86 运行时 | ⛔ **必然 FAIL** | K2-1 |
| 小批量(10–50),工作时段 | ⚠️ **可用但易中断** | K2-2、K2-5、F-12 |
| 大批量(数百–3000) | ⛔ **时间与稳定性不可接受** | K3-1、K3-2、K2-2 |
| Win10 现场 | ⛔ **未验收** | K2-7、K1-3 |
| 共享中心库多人同时操作 | ⛔ `main` 无锁;分支为合作式锁 | K2-4 |
| 库损坏/ICDB 失联恢复 | ⚠️ 诊断与手动路径可用;自动 Repair 未闭环 | K2-6 |
| 无 Mentor 的开发机 | ✅ 仅单元测试(需先装包) | F-26 |
### 4.3 建议的解除顺序
1. **先让"批量的失败是可信且廉价的"**:桥预检 + 打包运行时(K2-1)→ 不做无用刷新。
2. **再让"批量的中断可控"**:弹窗分级(K2-2)、取消/超时语义(K2-3)、占用与残留地址策略(K2-5)。
3. **然后才谈规模化**:增量扫描、进度、续跑(K3-1、K3-2)。
4. **平台边界单独验收**:Win10(K2-7)、共享库并发(K2-4)、ICDB 修复闭环(K2-6)。
---
## 5. 现场失败模式 → 代码根因映射
| 现场现象(文档) | 代码根因 | 对应问题 |
| --- | --- | --- |
| 6 项 `UNKNOWN_DIALOG: TF_FloatingLangBar_WndTitle` | IME 语言栏过滤条件过窄(类名+标题+无控件同时满足) | F-07 |
| `TUNER_R836` Save/Close 后桥返回 PENDING | 桥判定 + Verify 未提交;或原生 BackAnnotate 被拒 | F-17、K1-5 |
| `TUNER_R836_A` 数据库打开失败被记 UNKNOWN_DIALOG | 早期靠文本分类;现走规则白名单 | F-07 |
| `1GPHY_8211` 打开时失联 → 后续 Repair `REPAIR_DATABASE_IN_USE` | 失败打开的 PCB 未被关闭(分支已修:启动失败关闭路径) | K2-6 |
| 5 项 Project Integration 符号错误 | 工程/符号数据问题,工具只负责分类与留证 | — |
| 3 项 JobPrefs / 本地 Cell Library 失败 | 环境/工程状态;工具仅诊断不修复 | — |
| 端口 10000-10100 被保留 | `WinError 10013`,Hyper-V/WSL 动态预留 | K1-4 |
| 桥 UNAVAILABLE 但报告"四绿"风险 | 已被 fail-closed 设计排除(不会伪造 READY) | — |
---
## 6. 活跃分支现状(`codex/temp-issue-2-icdb-recovery`)
### 6.1 新增能力(相对 main)
- 库锁与占用探测:`library_lock.py`、`owner_probe.py`、`native_occupancy.py`(与上传工具兼容的 `.cbb-upload.lock` / `.blocked.json` 协议)。
- CBB 管理:`management.py`、`native_management.py`、`management_transaction.py`、`native_engineering_identity.py`、`native_export_guard.py`(新增/同名替换/移除、身份与导出副本保护)。
- 恢复:`reimport_recovery.py`、`scoped_manifest.py`、`post_repair_consent.py`、`pcb_restore_prompt.py`、`maintenance_entry.py`(库外完整工程副本恢复、历史 PCB 版本选择)。
- 策略调整:取消应用自动备份,改为**弹窗提醒手动备份**(`docs/releases/2026-11-03-manual-backup.md`)。
- 启动失败关闭:`failed_session.py` 扩展为"预检失败/数据库打开失败也协作关闭 PCB"。
### 6.2 本机验证结果
- 1,178 passed / 18 failed;其中 8 项与 main 同因(环境),新增失败集中在:
- **长路径**(`native_add_failures` 两个用例,150 字符目录名 → Windows `MAX_PATH`);
- **owner probe 依赖安装**(`native_export_guard` 6 个用例:子进程 `-m cbb_refresh_verify` 不可用);
- **编码**(`native_repair` 一个用例按 cp1252 解码失败);
- **无 Mentor 安装**(`native_repair` 取消用例)。
### 6.3 分支仍未满足的门槛(文档自述)
- 服务器会话失联 → 实际按钮触发 → 自动 Repair → 重开 → 保存关闭 → READY 的**完整链路未验收**。
- `1GPHY_8212` 原生 Repair 后 **BackAnnotate 仍被拒**,结论未变。
- Windows 10 未验证(当前实机 Win11 / EE7.9.5)。
- 历史 PCB 版本恢复记为 `RESTORED_REVIEW_REQUIRED`,**不等于无损修复**。
- 目标缺 `PartsDB` 分区时无法完成完整校验。
- 共享符号库不支持自动修复。
- 版本号未递增、分支未合并。
> 结论:分支在"管理 + 恢复"上补齐了很多能力,但**没有解除 K2-6(ICDB 自动修复闭环)和 K2-7(Win10)**;同时引入了新的环境敏感性(长路径、owner probe 子进程、编码)。
---
## 7. 测试与质量评估
### 7.1 本机结果
```
main: 463 passed, 8 failed, 1 warning, 37.09s
branch: 1,178 passed, 18 failed, 1 warning, 92.29s
```
main 的 8 项失败归因:
| 失败 | 原因 |
| --- | --- |
| `test_application`(2 项)、`test_abnormal_shutdown`、`test_extended_safety`、`test_failure_lifecycle`(共 5 项) | 子进程 `python -m cbb_refresh_verify` 依赖 `pip install -e .`,本机安装未完成 |
| `test_native_repair::test_repair_cancellation...`、`test_verify_runner::test_pcb_launch...` | 本机无 `D:\Mentor\7.9.5EE` 安装 |
| `test_packaging_status_bridge::test_compiled_bridge...` | 缺 x86 VC/MFC 运行时,`0xC0000135` |
### 7.2 覆盖情况
**做得好的**:状态判定(PASS 只能来自桥 READY)、对话框规则/后置条件、ICDB 日志新鲜度、备份/恢复、进程释放、UI 交互都有大量单测,且测试直接编码了"不得伪造绿色"的安全契约。
**缺口**:
- 没有真实 Mentor 的集成测试(全部依赖 fake COM/进程边界);
- 没有 Win10 测试矩阵;
- 没有网络库并发/多人场景;
- 没有长时间稳定性与性能回归(600s 空闲超时、3000 项批量);
- 测试与"本机安装 + 本机 Mentor 路径"耦合,换机即红;
- 无 CI,测试结果靠人工粘贴进 release note。
### 7.3 代码静态指标
- 38 个源文件 / 8,180 行;**102 处**宽泛异常捕获;15 处 `time.sleep`;15 处 subprocess 调用。
- 硬编码 `D:\Mentor\7.9.5EE\SDD_HOME` 兜底 5 处(可作为默认,但需在 UI/日志里明确"发现失败")。新机器上会静默落到不存在的路径,报错信息偏底层。
---
## 8. 修复路线图(建议)
### P0(1–3 天,先让批量"失败得正确")
1. **桥部署闭环**
- 打包 `VC_redist.x86.exe`(或桥改 `/MT` 静态链接),安装脚本检测/安装;
- 启动时执行一次桥自检(`--codec-test` 或空查询),失败则禁用"批量校验"并给出可操作提示;
- `read_library_fast` 返回 `UNAVAILABLE` 时,UI 明确"无法判定绿色,批量将全部失败",不静默入队。
- 验收:干净 Win11 + 无 VC 运行时 → 工具提示安装而不是跑 3000 次无效刷新。
2. **未知弹窗分级**
- 规则增加 `on_unknown: stop | record_continue | block_item`;
- 默认对"无按钮/纯文本/IME/浏览器宿主"仅记录,对"数据库恢复/许可/保存失败"阻断;
- 每次未知弹窗都落 `dialogs.jsonl` + 截图证据,批量结束汇总"待人工确认弹窗"。
- 验收:新增一个未登记弹窗的模拟场景,批量不中断且证据可查。
3. **取消/超时语义**
- 明确"取消 = 停止自动化客户端,保留原生会话";对 worker 增加强制终止开关(仅在未进入 Save 阶段可用);
- 看门狗在 supervisor 退出时按"是否处于 Save/Close"决定终止或保留,并落 `watchdog-decision.json`;
- `run_verify` 在 worker 未确认退出时不得释放互斥、不得继续下一项(当前已部分满足,需把"进程仍活"纳入 `safe_to_continue`)。
- 验收:模拟 Save 卡死 → 工具超时后 worker 确实退出或明确标记"仍活",下一项不启动。
### P1(1–2 周,现场可用性)
4. 弹窗代理超时预算与 `capture()` 并发控制(F-08);UIA 探测改为按进程白名单 + 单窗口超时,禁止泄漏线程。
5. 占用/残留策略(F-10、F-11):PCB 占用按 CBB 路径匹配;`sAddress.adr` 增加"不可达 + 非本机进程 + 超时"三条件判定为陈旧并可清理(需用户确认)。
6. 内容检查判定(F-03)与 `.prj` 编码(F-04)。
7. 中心库写入保护(F-15):改写 `pcb.prj` 前做整文件副本 + 变更清单,网络库至少保留原文件并可一键回滚。
8. 合并分支库锁(K2-4),并与上传工具约定锁协议。
### P2(2–4 周,规模化)
9. 增量扫描/指纹缓存、预检惰性化、进度条、取消当前项、队列持久化与续跑(F-19、F-20)。
10. 证据保留策略与磁盘配额(F-06)。
11. CI:mock 层全量测试 + 一台 Mentor 自托管 runner 做冒烟;版本号规范(`0.2.3b1+candidate.49`)。
12. 清理宽泛异常,至少在关键路径保留 `error_code` 与原始异常链(F-23)。
---
## 9. 附:关键证据索引
| 主题 | 文件:行 |
| --- | --- |
| 成功判据(桥 READY) | `src/cbb_refresh_verify/verify_runner.py:313-330, 981-1000` |
| 内容检查判定 | `src/cbb_refresh_verify/verify_runner.py:30-31, 128-141` |
| 预检(PRJ/PCB/链接) | `src/cbb_refresh_verify/verify_runner.py:144-174` |
| 端口预检 | `src/cbb_refresh_verify/mentor_adapter.py:1061-1082` |
| 数据库地址阻断 | `src/cbb_refresh_verify/icdb_ownership.py:13-16` |
| PCB 全局占用检查 | `src/cbb_refresh_verify/mentor_adapter.py:619-621` |
| CentralLibrary 改写 | `src/cbb_refresh_verify/mentor_adapter.py:93-162, 707-712` |
| save helper 循环 | `src/cbb_refresh_verify/mentor_adapter.py:790-816` |
| 取消信号 | `src/cbb_refresh_verify/desktop_worker.py:149-157`;`mentor_adapter.py:684-689, 744-746, 787-789` |
| 看门狗 | `src/cbb_refresh_verify/desktop_worker.py:25-56` |
| 弹窗规则 | `src/cbb_refresh_verify/dialog_rules.py:188-236`;`assets/dialog_rules.v1.json` |
| 弹窗代理超时 | `src/cbb_refresh_verify/dialog_agent.py:383-388`;`dialog_probe.py:37-44, 242` |
| 状态桥 | `src/cbb_refresh_verify/status_bridge.py:115-203, 206-332` |
| 批量状态扫描 | `src/cbb_refresh_verify/batch_status.py:95-122, 184-277` |
| UI 读库/队列 | `src/cbb_refresh_verify/ui/main_window.py:225-335, 417-548` |
| 打包清单 | `packaging/CbbRefreshVerify.spec:4-25` |
| 分支库锁 | `src/cbb_refresh_verify/library_lock.py:80-200`(分支) |
### 复现命令
```powershell
git clone https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795.git
cd cbb-refresh-verify-795
python -m pip install -e .
python -m pip install pytest pytest-qt
python -m pytest -q # main: 463 passed / 8 failed(本机环境)
git worktree add ..\cbb-branch origin/codex/temp-issue-2-icdb-recovery
cd ..\cbb-branch; python -m pytest -q # branch: 1178 passed / 18 failed(本机环境)
```
桥依赖验证:
```powershell
# 1) 导入表:KERNEL32 / mfc140 / MSVCP140 / VCRUNTIME140 / api-ms-win-crt-*
dumpbin /dependents .\tools\status_bridge\bin\CbbStatusBridge32.exe
# 2) 实机启动:缺 x86 运行时时的退出码 -1073741515 (0xC0000135)
.\tools\status_bridge\bin\CbbStatusBridge32.exe --codec-test
```
@@ -1,37 +0,0 @@
# 后台 ICDB 检查与原生任务排队
## 用户约定
ICDB 检查保持界面可用;校验、库管理、恢复、原生版本窗口等操作提交后串行排队,检查每完成一个 CBB 让出原生执行机会。检查与校验相互独立;检查不自动 Repair、Restore,不改变权威 READY 状态。
## 已确认的原因与修改
- 旧检查占用 MainWindow 的整批 busy 标志,缓存筛选及其他入口随整批禁用。改为独立 IcdbCheckTask、独立取消信号和捕获的工程/库快照;NativeQueue 每项准入,可取消等待,暂停检查不挡后续任务。
- 全局 PCB COM/ROT 可能等待其他工程的模态窗口。检查改为本任务完整 PCB 参数/PID、当前私有桌面、目标 MDI 和本次原生日志联合取证;正式校验继续使用原 COM 集成接口。
- PCB 参数匹配原为子串匹配,会把 `.pcb.backup` 或 `-ReusableCircuitOther` 误认。现按完整命令行参数匹配。
- DialogAgent 在读取子控件/UIA 之前按本任务 PID 范围过滤,执行前重新确认 HWND/PID/class;不读取或点击同桌面的无关弹窗。
- PCB 的临时启动窗口、普通/Reused Block 标题转换及 WM_CLOSE 后 IE 辅助窗口的短暂变化,不能解释为 ICDB 损坏。关闭前必须有目标加载证据;关闭后等待本任务退出,未知窗不点击、不重新发 WM_CLOSE。持续未知窗至期限结束才保留现场并报告。
- 诊断跳过无关集成历史日志,日志读取限定内容和两秒读取期限;超时结束该项,不反复堆积读线程。历史目录较多、历史日志较大不能直接判工程异常。
- ProcessWatch 用已打开的进程句柄观察退出,避免 COM 等待阶段每次轮询都启动 WMI 辅助进程。
- 原生退出后才产生完整 PCB Job Name 的缓冲日志必须在关闭后再核对。PASS 同时要求新 PCB 成功日志、新数据库路径和 PCB PID 装载日志,以及完整 PCB Job Name。
- 失败性质和实际释放事实分别记录。错误包含 ICDB 才标明 ICDB 错误;读写确认、版本选择和未确认原因单独显示。单项失败且释放已确认时继续下一项。
- 后台切库时只更新匹配的库清单;旧工程检查建议在后续管理操作后失效。旧库结果的释放入口不能释放当前另一个库。
- 网络映射由全部活跃 lease 登记保护,包括读取线程尚未交付给界面的 lease;拥有者结束时向仍在使用者转移映射。网络收尾需离开 Qt 线程,避免慢网络同步冻结界面。
## 原生验证范围
Windows 11、Mentor EE7.9.5。实验仅使用 `C:/Temp/CbbBackground-*` 中的完整隔离库;原始六个主要文件记录 SHA-256,来源保持不变。故意修改副本 `icdb.dat` 文件头得到 `SingleFile: ERROR ... in old, unsupported format`,用于验证当前错误分类和失败后的安全退出,不能代替现场失联故障验收。
`diagnostics/icdb-authority-20261105/validate_background_native.py` 运行应用的 `run_verify(maintenance=True)` 完整检查入口,在每次工作桌面放置另一个 PID 的真实模态窗口。要求损坏项报告明确 ICDB 错误并安全退出,下一正常项完成打开检查;无关弹窗在本任务结束前保持未操作;不得执行自动修复。
原始日志及结果在 `diagnostics/icdb-authority-20261105/background-native-result.json` 和对应 C:/Temp 证据目录。冻结包的 BUILD.json、VALIDATION.json 分别记录源码哈希与本包验收证据。
源代码完整链路于 19:16—19:17 通过:损坏项 FAIL / ICDB_REPAIR_REQUIRED / safe_to_continue=true,耗时 62.062 秒;下一正常项 CHECKED / safe_to_continue=true,耗时 26.704 秒。两个其他 PID 的模态窗口均保持未操作,来源六文件哈希不变。此记录另存 `background-native-source-result.json`;最终候选包必须再次通过自身冻结执行器的原生验证。
`validate_background_gui.py` 额外通过真实检查按钮提交检查,再提交权威状态读取并测试排队期间缓存筛选。其单行目录 PENDING 状态为测试注入,原生打开、退出和后续状态读取均实际执行;这不构成现场真实库状态的验收。
r9 冻结执行器实测通过同一批次:故障项 68.531 秒,安全释放;正常项 33.313 秒,CHECKED 且安全释放,其中启动 17.093 秒、关闭 8.703 秒;两个无关弹窗未操作。界面实测 34.703 秒,检查和状态读取顺序为 check-start → check-end → status-start → status-end,排队期间缓存筛选可用,50ms 事件循环计时器最大间隔 79ms,后续原生状态为 READY。该时间只是本机当前样本结果,不作跨样本速度提升比例。
## 保留限制
检查仍需实际启动 Mentor。去掉 COM/WMI 和无关日志开销,不等于消除原生程序启动和数据库加载时间。日志或文档身份不足时报告未确认,不推断 ICDB 损坏。实际未释放的当前任务会停止后续原生写入并提供释放入口,界面缓存操作继续可用。ICDB 自动修复和现场服务器会话失联恢复未验收;本候选包不关闭工单、不作为正式发布。
@@ -1,7 +1,5 @@
# 阻塞范围收紧记录
> 后续审查已修正本记录中“切库清除旧标志”和“只检查 Work”的不足。当前行为与验证请以 [全链路审计](2026-11-05-blocking-lock-audit.md) 为准:状态按库保存,释放包含共享数据库并绑定原任务范围。
本轮处理的是“一个 CBB 出问题后把整批和其他库一起停掉”的误阻塞。
## 已收紧
@@ -1,132 +0,0 @@
# 全链路阻塞与锁审计(2026-11-05)
本次目标:枚举从按钮到批次结束的阻塞条件;消除把单项失败、历史记录或无关进程当成本任务仍占用的情况;用实际运行核对退出和下一项继续。
这是一份开发与验证记录,不把维护说明加入产品 UI。ICDB 批量检查不执行自动 Repair,不把普通打开失败推定为 ICDB 损坏。真正仍在运行的同库写会话继续串行;不能通过删除 Mentor 地址/锁文件、强杀数据库进程来制造“已释放”。
## 已复现的现场链路
旧候选包对 IP101GR 打开检查时,原生 PCB 显示完整的 `Continue to open the design with read/write access permission?` 问题。程序报 `DATABASE_RECOVERY_REQUIRED`,启动收尾函数却只接受 ICDB/数据库加载失败类别,返回 `STARTUP_FAILURE_UNCONFIRMED`,未取消打开。PCB 60544 和启动器 63824 留在本任务私有桌面,导致后续会话不释放。
2026-11-05 使用修改后的真实退出函数,核对本次进程、工程参数、私有桌面和精确原生全文后点击 **No (7)**;两个进程均退出。6 个主要文件(LMC、PRJ、PCB、工程数据库、Layout、PCB工程配置)前后 SHA-256 一致。原有两个 Project Backup 会话没有被终止,没有执行 Repair/Restore。
证据:`diagnostics/icdb-authority-20261105/field-readwrite-cleanup/result.json`。旧候选包原始 evidence 保留,不覆盖。
## 逐阶段清单
“保留”表示正在执行或归属无法确认时仍需要该条件;“修正”表示本次已定位误阻塞并实施回归修复。最终运行结果在文末登记,不能仅凭表格认为现场验收成功。
|序号|阶段 / 代码入口|触发条件及原有影响|处理|
|---|---|---|---|
|1|UI `busy` / ServiceWorker|真实任务执行中禁用启动、编辑路径、关闭;任务异常后必须恢复按钮|保留串行;检查 finished/failure 收尾|
|2|UI 已加载路径|输入路径改变但仍使用旧清单|保留身份检查,不启动旧目标|
|3|UI 选择 / 筛选|隐藏项、READY、缺工程进入检查队列|保留:隐藏项取消勾选;READY 即使选中也排除检查;管理选择独立|
|4|UI 状态刷新|检查结束后条目仍按旧状态禁用或勾选|刷新受影响条目,保留搜索;READY 清旧勾选|
|5|UI management unsafe|切换库清掉唯一的未释放标志,返回原库失去状态|修正:按库保存;A 不影响 B,回到 A 仍保留真实未释放事实|
|6|UI 原生版本会话|正在运行的同库版本窗口与写任务冲突|保留;其它库和清单筛选独立|
|7|版本窗口返回|启动器退出但结果缺失/身份错/子会话未确认|保留当前会话,不因窗口消失虚报恢复成功;释放入口可独立重查|
|8|全局原生 mutex|真实另一个校验/管理/恢复正在使用共享原生通道|保留实际串行;不把互斥失败持久化成本任务数据库 owner|
|9|库协调 OS handle|上传工具/本程序对同库持有独占句柄|保留真实冲突;不能用删文件绕过|
|10|协调文件创建|权限/路径/网络错误也被统一报“有锁”|修正:区分 sharing/lock violation 和访问错误;启动前失败可重试|
|11|历史 checkpoint|同库旧记录、pending、损坏 JSON 一律阻止管理|提供有证据的释放/归档;归属完全丢失时不能证明未知分析副本,列明未确认原因,不擅删|
|12|retained 管理 lease|失败时保留的句柄没有可再次检查的 release probe|修正可重查的精确 operation / scope;未退出仍保留|
|13|显式释放 scope|全机 retained exporter/worker 阻止另一库释放|修正按 operation / library 范围,不采用同名即归属|
|14|释放范围|只检查目标 Work,遗漏共享符号库;或遍历全部库和快照|修正目标库 / 目标 CBB / 实际共享路径,保留共享库互斥|
|15|owner 匹配|原始字符串包含 Work 会误匹配 WorkOld,job.json worker 又漏匹配|精确参数/目录边界及记录的 operation 归属;无法读取归属单列未确认|
|16|PID 重用|旧 PID 恰巧分给另一进程,形成永久旧 owner|新记录绑定创建时间/句柄,旧格式需独立释放证据|
|17|工程 preflight|缺 PRJ/PCB、无工具、非法参数|保留单项失败;未启动会话不保留执行锁、不停其它项|
|18|post-repair proof|非法凭证在任何 worker 创建前被标为 unsafe|修正为启动前拒绝,下一项可继续|
|19|content-check timeout|只读辅助进程超时与真实原生会话混淆|必须区分子进程是否退出,不以 timeout 字样推断 owner|
|20|DesktopWorker 构造|CreateDesktop/CreateJob/CreateProcess 失败,未创建 worker 仍被标 unsafe|修正句柄回滚并返回显式 no-process 证据;已部分启动仍未确认|
|21|原生读写确认|要求确认无其他用户,原程序不 Yes 也不 No,留下 PCB|修正:仅精确全文、PID、工程、桌面一致时 No;等待退出,绝不自动 Yes|
|22|PCB 历史版本选择|有两个版本,需要用户选择;不能代选|记录候选版本;扫描不执行历史回退,取消已识别的本次打开后收尾|
|23|其它已知 fatal|确认错误后仍存在空 PCB|正常关闭本任务空壳;不能要求先判为 ICDB 才允许收尾|
|24|未知弹窗 / 文档|不能证明是空壳、存在文档、非本进程、不同桌面|保留,不盲点按钮;显式给出未释放窗口证据|
|25|PCB 先退出|common 启动器延迟退出|等待 PCB 与启动器,不在任一仍活着时说释放|
|26|No 后旧地址|尝试打开被明确拒绝,但旧地址让本任务空壳不能退出|修正:取消本次打开不要求先取得外部数据库;保留地址,不声称数据库无人占用|
|27|COM 无文档 / ROT|COM 指向他人会话或 ActiveDocument 为空|只依据本任务进程/路径/桌面关闭空壳,不借全局 ROT 关闭他人工程|
|28|保存 / Close 超时|COM 仍可能在写;第二个 close helper 会重复操作|保留已有 helper,观察其释放,不强杀 PCB/数据库或重复保存|
|29|取消 / 主窗口关闭|取消发生在启动、校验、保存任意阶段|合作停止本任务,禁止新项;收尾确认后可再次启动|
|30|会话释放证据|worker 已退出,但 native/automation client 仍在|保留真实未释放;只有独立退出证明才能提升安全状态|
|31|可选报告/性能记录|释放成功后写报告失败又变成 unsafe|修正:报告失败保留告警,不覆盖执行结果和退出事实|
|32|progress / 批次报告|回调/磁盘写入异常终止循环,UI generic failure 挂锁|修正隔离展示错误,保留已完成结果与释放事实|
|33|批次单项 FAIL/BLOCKED/TIMEOUT|某项失败但已正常退出,被错误扩大成全批失败|依据实际 release 继续;用户取消/真正未知会话仍停止同通道任务|
|34|管理预检查|desktop/mapping/capability/source 失败,尚未原生激活即 unsafe|修正显式 activation-start 状态;未启动可重试|
|35|管理 catalog 失败|返回 success=false/safe=true 被异常丢掉 release|修正操作成功与会话释放分别传播|
|36|管理检查点恢复|catalog_before 中断就阻止所有 CBB,和实际 remove 中断混同|区分 mutation 前失败和已发生修改;后者保留数据恢复要求|
|37|无关 LM/PCB/viewdraw|全机任意同名进程阻止目标库检查/恢复/导出|绑定目标工程、库和共享数据库;COM 激活若无法证明隔离仍单独说明|
|38|工程内容导出|收养所有同名 iCDB server / exporter,等待无关进程永不退出|修正仅本次后代和精确分析副本 owner;保留实际后代|
|39|导出副本回收|一个库的 retained export 挡住另一个库|修正 registry 库/副本身份,配合数据库独占读取|
|40|sAddress.adr|存在即被称为“有人占用”|存在只表示需原生确认;保留文件,NOT_IN_USE 只能由严格绑定的 inspection 得出|
|41|备份恢复异常|源路径/清单预检失败也报 unsafe、UI 挂锁|修正沿用是否实际启动/释放事实;目标改动与内容冲突仍阻止安装|
|42|批量状态读取协议|A 响应不匹配就把未查的 B 等都标 MALFORMED|修正重启桥接并逐项读取,不伪造后续状态|
|43|状态缓存身份|只凭字节/名称复用另一库的结果|修正规则版本 + canonical library / block type 身份|
|44|映射关闭|先置 closed,再取消映射;失败以后不能重试|修正确认成功才关闭;保留用户/被改指向的映射|
|45|无关盘枚举失败|另一个盘查询失败阻止目标 share 复用|修正独立确认目标盘;未知盘只作为不可用盘符|
|46|真实地址/共享库占用|同目标 / 实际共享数据库活动 writer|保留实际写互斥;普通错误不得扩展成永久禁用其它独立功能|
|47|未知执行异常|无法知道是否已经启动/改数据|保持未确认;修已知 prelaunch/reporting 根因,不能把一切异常默认放行|
|48|退出后 cscript owner 查询|3 秒包含 helper/Python/COM 启动,现场实际约 4.75 秒,误报查询超时|真实隔离批次复现;改为统一 10 秒有上限查询,超时仍是未确认而非确认占用|
|49|导出全进程 WMI|直接 WMI 卡住会让 supervision 长期保留 worker|移入有上限只读 helper,保留所有名称的真实后代;启动前查询失败不会制造 native owner|
|50|操作后内容/状态失败|移除/新增已返回安全退出,但后续读取失败又丢失释放结论|内容恢复状态与进程释放分别保留,不能用 mutated 标签代替活动会话证明|
|51|启动前证据磁盘错误|目录/request/worker.log 创建失败,被通用异常当原生会话未释放|明确尚未创建 worker 的失败可继续;runtime 指纹写入为可选,不掩盖真实结果|
|52|证据查看器|打开证据路径失败进入通用 worker 错误处理,错误保留映射|只显示查看失败,不创建数据库未释放状态|
|53|维护库归属|目标 RepairTarget 可证明所属库,却仍全局检查 retained worker/export|从原 PRJ 的唯一有效 CentralLibrary 解析身份,复用统一归属检查;普通扫描保持独立|
|54|同库路径别名|同库 drive/UNC/大小写别名被当成另一个库,或 UI resolve 访问失联网络|使用已有 lease 映射和本地规范键,不在控件更新中访问网络|
|55|同盘符多个 retained 库|A 释放后所有权转到当前 A,关闭 A 会断掉仍有 B 会话使用的盘符|关闭前把所有权交给同盘符/共享路径的 retained B;B 未释放不取消映射|
|56|目录输入的库身份|原始输入为目录,释放同目录任意 LMC 都可能误匹配|读取时绑定选中的实际 LMC;未绑定目录不接受 sibling LMC 释放证明|
|57|已释放但待数据恢复|同目标正确阻止重放,却把旧 safe=true 改成 false,进而停止独立目标|保留同目标数据恢复要求,同时保留已释放事实,独立目标可继续|
|58|真实 EDIF 参数形式|程序发出 `-icdb <目录>`,归属解析器只认 `-icdb=<目录>`|兼容实际分离参数并按完整目录边界匹配,不把明确无关的导出器当未知 owner|
|59|Add 的 pre-capture 准备|原始库引用/清单/工程对齐失败发生在导出前,却继承 unsafe|准备阶段失败明确未启动;实际 capture 后始终沿用真实释放证据|
|60|最后一笔导出进程记录|native 和数据库已释放,但 finally 中的 process.json 写入异常覆盖结果|最终报告 I/O 保留真实 release;无退出证明的分支仍保留 owner|
|61|冻结代理启动与 PCB 门禁|代理十秒未就绪可误报,工作进程又只等十五秒|代理启动 30 秒、工作进程门禁 45 秒共享常量;日常 IPC 仍为 2 秒,监听以 0.2 秒轮询响应取消|
|62|连接握手/门禁取消竞态|用户在 handshake 时取消,父进程仍可能先放行 PCB|认证后、门禁放行前、worker 执行原生前都再次检查取消;等待门禁时也响应取消|
|63|残留释放入口|只显示存在进程即拒绝,没有正常关闭、保存提示或确认后结束的路径|增加精确名单、逐项关闭、保存选择、独立强制确认、重新证明与继续未执行项;未知归属也显示供定位|
|64|释放后的全库证明|对普通输出逐个重复 resolve,同一副本 23,218 条记录导致原生退出后仍等待约 97 秒|一次规范库路径;复用已拒绝链接的扫描 metadata,先筛原生数据库候选再独占读取;同一库证明约 6.9 秒|
|65|管理启动前历史阻止|旧记录让新任务尚未启动便失败,却被 LibraryBusy 类型强制改成 unsafe,UI 永久禁用;扫描也不显示记录和无 JSON 的 retained lease|新任务在互斥内先做完整复核,归档旧记录并恢复句柄/映射;未启动不制造 owner,UI 旧标志转为重查要求,历史/内存记录可见;同目标未恢复修改仍禁止重放|
## 执行与验收顺序
1. 保存现场弹窗、PID、request、release 和主要文件 hash;正常取消本次遗留打开。
2. 各域先写失败回归,分别修空壳/弹窗、UI/批次、库协调/管理、导出/恢复、网络/状态桥接。
3. 统一串行运行全量测试,避免测试之间竞争真实 Windows named mutex。
4. 在新隔离库运行应用检查入口:故障/提示项 → 正常项;确认无自动 Repair,无遗留本次 native owner,原来源文件保持不变。
5. 新目录生成候选冻结包;校验冻结源码一致、启动/退出、x86 桥接、冻结检查链路,再打开供用户测试。
## 验证记录(持续更新)
- 现场遗留读写确认:真实 No 取消,PCB 60544 / launcher 63824 退出,6 项 hash 一致。
- startup / desktop / native repair 相关回归:194 passed(后续统一全量再次覆盖)。
- 第一轮真实副本批次:**未通过**。成功复现原始读写确认;新取消路径正常退出,但随后 cscript owner helper 的 3 秒超时将结果重新标为 unsafe,后两项 SKIPPED。原库 6 项 hash 一致。保留 `blocking-live/result.json` 与完整原始记录。该误阻塞已新增回归修正,原副本重跑结果见下一条。
- 修正后的真实副本批次:**通过退出与继续验收**。`blocking-live/retry1/result.json`:现场副本 `FAIL / DATABASE_SAFETY_STOP / safe=true`(No 正常取消);故意损坏副本 `FAIL / ICDB_REPAIR_REQUIRED / safe=true`;健康副本 `CHECKED / safe=true`。三项各自 `session-release.json` 均为 worker 已退出且 remaining_pids=[]。源 6 项 hash 一致,无 Repair/Restore/保存集成。此结果证明失败项能够退出并继续,不证明故障内容已修复。
- 第一轮统一全量:1452 passed / 3 failed。三项为旧测试的相对路径归属 fixture、缺 library 的内部请求 fixture,以及新增的应用 JSON 回收 callsite 未纳入静态审计白名单。已限定修正 fixture 和 JSON callsite;未放宽未知原生归属、未允许删除 Mentor 文件。审查额外发现的 55–60 项已补回归并纳入下述复跑。
- 统一全量复跑:**1479 passed**,1 条既有 pywinauto STA warning;`blocking-final-pytest.xml`。编译与 diff 检查通过。
- 后续冻结实测:现场副本 FAIL 退出后继续;损坏样本遇到 `DIALOG_AGENT_START_TIMEOUT`,同样已释放并继续;健康样本 CHECKED。该结果只通过退出/继续验收,损坏样本本轮未进入 PCB,不能算内容检查通过。由此补充 61–62 的启动/取消修正。
- 启动修正增量:**239 passed**,含代理、worker 门禁、普通验证、批次、保存/退出、修复凭证与 UI 回归;`startup-delta-pytest.xml`。本机另有独立 pytest 使用相同产品 mutex,增量回归使用专有测试 mutex 名,产品互斥名不变。
- **最终 r3 冻结链路通过**:`blocking-live/frozen-r3/result.json` 中现场副本 `FAIL / DATABASE_SAFETY_STOP / safe=true` → 损坏样本 `FAIL / ICDB_REPAIR_REQUIRED / safe=true` → 健康样本 `CHECKED / safe=true`。三项实际启动 PCB,三项本次会话均退出、没有未执行项、没有 Repair/Restore,原库 6 项主要文件 hash 一致。
- 冻结验证使用与包内字节码逐项比对一致的控制层,worker、弹窗代理、原生日志和进程探测均运行实际冻结 exe;没有把源码子进程冒充冻结子进程。24 个 Python 模块及 2 个 VBS 内容一致;实际 GUI 启动/退出、x86 codec、包内 VC runtime 加载、完整进程快照 helper 通过。
- 最终独立只读复核:已报告的 P2 修正后无剩余 P1/P2;后续启动预算/取消竞态也单独复核通过。当前实测环境为 Windows 11 / Mentor EE7.9.5,Windows 10 未实机验收。
- 候选包目录:`dist/blocking-locks-20261105-candidate-r3/CbbRefreshVerify-Background`。`BUILD.json` 记录源码基线/实际文件 hash,`VALIDATION.json` 记录全量与增量测试和原生链路结果;仍是候选包,不合并发布、不关闭工单。
本次不宣称 ICDB 自动修复已通过验收。生产库的其它原生 Project Backup 会话保留;它们连接失败不等于数据库损坏,也不等于可强夺写权限。
## 确认释放会话(后续增量)
用户反馈 r3“释放检查”遇到两个 Project Backup 进程只返回不能解除,没有关闭入口。本次增加“释放残留会话…”:先列当前库关联进程和工程,确认后逐项正常关闭。已加载 PCB 允许正常关闭;标准保存问题由用户明确选择保存、放弃或取消。已知启动确认可正常取消。单项未退出继续处理其它项;全部退出后再证明库文件可独占读取,归档本应用旧 checkpoint,解除保留句柄与映射,恢复按钮。
正常关闭无法完成时,提供独立的“强制结束所列会话…”警告确认,默认取消,列出项目、进程和 PID,明确未保存修改丢失及写入中断风险。仅对已证明属于当前库、重新核对 command/creation/image/进程句柄身份的列表发送结束请求;不是全机按进程名清理。此显式功能不改变普通检查/关闭/取消任务的合作退出策略,不删除 Mentor 地址、数据库或锁文件。
不安全批次结果可直接进入释放;取得当前库释放证明后,重新显示结果框,用户可点击“继续未执行项”。只恢复原检查/校验中 SKIPPED 的条目,重新套用当前可见性及非 READY 资格。失败项不自动重放,库增删改不自动重放。
原生实际验证:`diagnostics/icdb-authority-20261105/confirmed-release-b00c3b7c/result.json`。在 `C:/Temp/CbbBlocking-15cb2f99/healthy` 一致副本运行真实 Qt 确认按钮,正常关闭 Project Backup PID60404,监督 worker PID13008 随后退出,full release proof 通过;6 个主要文件 SHA-256 前后一致,未执行 Repair/Restore。截图 `preview.png` / `released.png` 保留。初次试验遇到不存在的 pywin32 查询 API,已改用 Windows QueryFullProcessImageNameW 并增加真实句柄回归后重跑通过;初次证据不覆盖。
当前边界:跨机器会话、不可读归属、操作系统拒绝权限或原生数据库地址未释放,不能通过本机结束请求制造成功。最终证明失败会保留原始原因与证据。强制结束仅证明进程结束,不证明工程数据完好;ICDB 自动修复仍未验收。标准 PCB 保存提示有精确消息/按钮与 UI 单元验证,尚无真实未保存 PCB 工程的端到端保存验收。
验证记录:统一全量 **1509 passed**(`residual-release-pytest.xml`,328.25 秒,1 条既有 STA warning);最新释放/未知归属/确认名单竞态/界面继续入口/库协调/文件保护增量 **83 passed**(16.42 秒)。未知归属进程现在显示为诊断行;只有预览时和执行时都证明属于当前库的项才可以关闭,执行时恢复可读不能扩大用户确认过的名单。代码复核发现的结果框隐藏及确认名单竞态均补先失败的回归后修正,最后只读复核未发现剩余 P1/P2。编译与 diff 空白检查通过。
r4 冻结增量的第一次实际试验没有通过 100 秒测试门槛:原生 PID25260 / worker PID61916 已正常退出,旧 checkpoint 已完整归档且 release proof 成功,但全库证明对 23,218 条记录反复路径解析约 97 秒,测试控制器已提前超时。证据 `confirmed-release-dfb29e88` 保留,不能算该轮通过。新增失败回归后修正了普通文件的多余解析,同一副本实际 proof **6.906 秒 / 12 个独占文件**;最新涉及库释放、维护范围、网络映射和 UI 的回归 **105 passed**(17.09 秒)。新的 r5 候选需再次执行完整冻结释放链路。
**r5 冻结链路已通过**:`confirmed-release-99f3f4e0/result.json`。真实 Qt 确认入口关闭 Project Backup PID48080,包内监督 worker PID23040 退出,旧 checkpoint 归档并清除,12 个原生文件独占读取证明通过,6 个主要文件 hash 一致。整个试验约 27 秒(含启动后等待 15 秒、列表查询、关闭及复查),原生退出至释放完成约 6 秒。随后立即使用同一 r5 exe 运行真实 PCB 检查,`next-check-result.json` 返回 `CHECKED / safe=true`,实际打开正常并退出、remaining_pids=[]、没有 Repair/Restore,证明清理后可以继续后续任务。此检查耗时约 100 秒,其中 PCB 启动约 86 秒;不能把该启动耗时称为释放卡死。
r5 包内 26 个 Python 模块及 2 个 VBS 与当前源码一致,实际主窗口启动/退出、x86 codec、包内 runtime 和冻结进程探测 helper 均通过。性能改动经独立只读复核,未发现新 P1/P2。只交付候选包,不关闭工单或宣称 ICDB 数据已自动修复。
r6 用户中心库误阻止的根因、源日志、修正和冻结管理链路见 `2026-11-05-management-phantom-blocker.md`。统一全量 1518 passed;完整原生移除与重新读目录验证通过。历史记录本身不再被直接当作活跃会话,管理入口允许重新复核;生产库工程未改动。
@@ -2,7 +2,7 @@
## 现象
代码与回归测试确认:原生 worker 创建私有 Windows Desktop 后,如果 Job Object 创建或 worker 进程启动失败,构造函数直接抛出异常,已创建的 Desktop 和 Job 句柄没有释放。重复失败存在累积私有桌面资源的风险;本次未对现场所有桌面异常作归因。
原生 worker 创建私有 Windows Desktop 后,如果 Job Object 创建或 worker 进程启动失败,构造函数直接抛出异常,已创建的 Desktop 和 Job 句柄没有释放。重复触发失败会留下孤立的私有桌面对象,表现为桌面资源持续增加、后续同名或同类原生任务启动异常。
状态读取路径还有一个相同的边界:`read_library_flag` 在进入资源清理保护前加载 UI 依赖;依赖加载异常时,刚创建的私有桌面无法执行 `CloseDesktop`。
@@ -11,37 +11,26 @@
1. `DesktopWorker.__init__` 的资源申请跨越多个可能失败的步骤,但没有事务式回滚。
2. 进程句柄、Job 句柄和 Desktop 句柄的释放顺序没有覆盖构造阶段异常。
3. `read_library_flag` 的依赖导入位于 `CreateDesktop` 之后、`try/finally` 之前。
4. `read_library_flag` 和 `read_library_tree_image_map` 都在清理保护外先创建 Desktop,再执行 `Path(library)` 等准备逻辑;准备阶段抛异常时也会泄漏。
## 解决方案
- 在 `DesktopWorker` 构造开始时初始化资源字段,并把 Desktop、Job、worker 创建放入同一异常边界。
- 构造失败时按 worker、Job、Desktop 顺序回滚;已启动的 worker 先终止,避免留下无父级的原生进程。
- 在状态读取创建 Desktop 前完成 UI 依赖加载,确保依赖异常不会产生未受保护的 Desktop。
- 两处状态读取均在准备逻辑完成后、`try/finally` 内创建 Desktop,清理时检查资源是否存在。
- 测试中分离 Desktop、Job、Process、Thread 的接口,断言失败后关闭顺序;覆盖四个构造失败点与进程创建后的终止分支。
- 增加回归测试,模拟 worker 启动失败并断言 Desktop、Job 均已关闭。
## 影响范围
- 覆盖原生 worker 构造失败,以及状态读取准备和启动阶段的资源清理路径。
- 只影响原生 worker 启动失败和状态读取依赖加载失败时的清理路径。
- 正常任务的私有桌面、Job Object、进程树和数据库释放策略不变。
- 不会切换用户输入桌面,也不会改变中心库写入策略。
## 验证
- 修复分支完整 `python -m pytest -q --tb=short`:480 passed。
- 同环境、同工作树切换到 `origin/main`(`39985f7`)完整运行相同命令:471 passed。两次运行依次执行,均仅有一条 pywinauto STA 警告。
- `tests/test_desktop_worker.py`:9 passed。两处状态读取准备阶段泄漏的新增测试在修复前 2 failed,修复后通过。
- 变异验证:把回滚中的 `self.job.Close()` 故意改为 `self.job.CloseDesktop()`,测试产生 2 failed;恢复正确代码后通过。
- `python -m pytest -q tests/test_desktop_worker.py tests/test_dialog_agent.py tests/test_native_inspection_release_regressions.py tests/test_verify_diagnostics.py`:33 passed。
- `python -m compileall -q src tests`:通过。
- `git -c core.whitespace=cr-at-eol diff origin/main HEAD --check`:通过。命令显式识别 Windows CRLF;仓库 `.gitattributes` 为 `* -text`,保留源文件换行,不依赖本机 `core.whitespace` 配置。
此前 #7 将一次运行中的 `test_backup_recovery.py::test_invalid_source_does_not_touch_target` 失败称为既有基线问题,缺少同环境对照,撤回该归因。本次该用例在 main 与修复分支均通过。审查者在旧 WIP 基线测得的 19 个失败不属于本次从 main 独立提交后的测试范围。
## 合并范围修正
原 PR #7 以 ICDB WIP 分支为父提交,却以 main 为合并目标,实际携带 59 个提交、118 个文件。现从 main 单独 cherry-pick 桌面修复并补充上述审查修正;相对 main 只有本工单、两个源码文件和一个测试文件,共 4 个文件。独立代码复审未发现待处理问题。
- `git diff --check`:通过。
## 分支
`codex/desktop-leak-main`
`codex/desktop-leak-pr`
@@ -1,47 +0,0 @@
# 导出身份比对与备份恢复:阻塞审计及修正
本记录只覆盖 `native_engineering_identity.py`、`native_export_guard.py`、`backup_recovery.py`。没有启动原生工具,没有修改生产库、Mentor 地址、锁或数据库文件。完整应用现场验证由主任务单独记录。
## 从前到后的阻塞点
| 阶段/触发条件 | 修正后行为 | 保留原因/证据 |
|---|---|---|
| 输入工程身份、库引用、工程完整性或独立目录不符 | 本项拒绝;没有创建原生会话时可继续下一项 | 防止替换错误工程;不是占用锁 |
| EE7.9.5 导出程序缺失或二进制版本未通过能力探测 | 本项拒绝;未启动即不宣称会话未释放 | 不猜测原生接口 |
| CBB 操作互斥量实际被其它操作持有 | 不并行启动;保留原有串行约束 | 原生 COM/共享库任务串行运行 |
| 库协调句柄确实独占或已有未释放任务 | 保留互斥 | 句柄/释放证明由 `library_lock` 负责 |
| 机器上存在其它工程的 PCB、LM 或原理图进程 | 不再单凭进程名阻塞恢复 | 完整工程/数据库/库路径参数匹配;`WorkOld` 不匹配 `Work` |
| 有原生进程但没有可识别的工程参数 | 本项返回 `TARGET_NATIVE_OWNER_UNCONFIRMED` | 尚不能通过进程名称判断它打开的文档;不称为确认占用 |
| 进程参数明确属于目标工程或目标库 | 本项返回 `TARGET_NATIVE_OWNER_ACTIVE` | 不抢占用户或其它任务会话 |
| 目标/共享数据库仍有 `sAddress.adr` | 本项返回地址状态未确认;保留地址原件 | 地址存在不等于活动占用;目前该写入入口仍需原生判断 |
| 目标 LMC、工程/PCB 的 `icdb.dat` 或 Layout 无法独占读取 | 拒绝安装 | 补上实际文件句柄探测,包含共享 `__ReusableBlocksSymb` |
| 源、目标、验证副本内容在复制/验证期间变化 | 本项拒绝覆盖;已证明释放时不制造未释放状态 | 保留原文件与清单 |
| 其它工程的 iCDB 导出器/服务器存在 | 不再全机拒绝导出,也不收养为当前任务后代 | 仅追踪本次后代和命令明确指向本次分析副本的原生进程 |
| 当前导出器或后代仍活跃/句柄未释放 | 保留导出任务及它所属库的排除 | 不杀原生进程;库 A 的已绑定记录不排除 B |
| 创建导出进程遭明确 FileNotFound/Permission/CreateProcess 拒绝 | 返回失败且本任务会话安全;可重试 | `native_started=False` 及 `export-launch=false` 绑定证明 |
| 导出构造异常但可能已经启动原生进程 | 保持未确认,不能因没有返回 Python 对象就放行 | 明确区分未启动和部分启动 |
| 导出前完整进程树查询超时/失败 | 本项失败且明确未启动;释放本任务未启动的 guard,可继续独立项 | 不把查询失败视为空进程列表或数据库无人占用 |
| 已启动导出后的完整进程树查询超时/失败 | 10 秒以内返回未确认,保留本次进程与已记录句柄 | 不无限等待 WMI,也不强杀原生进程 |
| 导出器已退出,但输出错误或不完整 | 内容失败与释放结论分开 | 不因业务失败制造活动会话 |
| 导出后的汇总报告写入失败 | 保留已确认释放;报告写入错误另行返回 | 先完成释放证明及清除本次导出 guard,再写可选汇总 |
| 恢复开始前检查失败或恢复结果报告写入失败 | 保留 `release_confirmed`;没有原生会话则允许其它独立项继续 | 不再统一返回 `safe_to_continue=False` |
| 程序重启后导出 PID 被其它进程复用 | 新记录比对 creation identity 与 executable;不同身份不当成旧 owner | 旧记录没有创建身份时仍需新鲜独立证明 |
| 正常导出 checkpoint 存在 | 重新核对库、lease、token、独立副本、进程身份、地址和数据库句柄 | 不把其它同名服务器当作当前副本 owner |
| 应用 checkpoint 损坏 | 默认拒绝;显式释放入口持有完整库/原生证明时可使用 `allow_unknown_checkpoint` | 此路径仍要求全机已知导出 owner 和 retained registry 均空;调用者必须归档未变化的原字节 |
## 回归验证
首次新增的六项失败测试均先观察到旧实现失败,然后实现修正。领域测试曾串行运行 `81 passed in 62.78s`;后续增加了未知启动、损坏 checkpoint 显式释放、无 PID 证明、报告 I/O 及 PID 复用的正反测试,新增子集 `12 passed`,汇总报告 I/O 正反 `2 passed`。主任务须再进行最终全量运行;多进程并行运行这些测试会争用产品全局 named mutex,不能把相互争用的结果当成业务失败。
全进程树查询现已移入现有 `--owner-probe` 只读 helper,使用版本化 snapshot 协议并保留 PID、parent、未知可执行文件名称、命令、路径和创建身份。上限统一为 10 秒,为 helper 启动及 WMI 查询保留余量;超时只结束读取进程的 helper。回归覆盖启动前与启动后的查询超时、未知后代、PID 0 系统项、协议版本、重复 PID、缺少创建身份等。新增相关子集 `17 passed`。实际本机只读 helper 返回 457 个进程(包括非 `.exe` 系统名称),457 项创建身份,耗时 4.75 秒;该数值是一次观察值,并非上限,没有启动 Mentor。
最后补充了 `capture_identity` 的启动前异常边界:来源校验、当前 lease 证明、证据目录范围、导出器能力检查、目录创建或 mutex 创建失败,均返回明确未启动的安全失败,不把被调用者异常变成活动会话。六项对应的失败测试先观察到旧实现抛异常,再验证修正;与查询预算、已启动失败的正反测试合并为 `11 passed`。这些测试没有取得产品全局 mutex。
最后一次只读复审补齐了进程诊断记录写入边界:已证明导出进程/后代退出且副本数据库已释放后,最终 `*-process.json` 写入失败只附加报告警告,不能抹去释放事实;仍有活跃原生进程时保持未确认。首个 `export-launch.json` 在任何启动前写入失败,则返回明确未启动;仅凭本进程当前 lease、匹配的一次性 token、独立副本 owner 和零 process records,清除此任务尚未启动的 guard。缺少日志不能由重启后的无身份记录借用此通路。三项报告异常回归先失败,修正后与未释放正反测试合计 `7 passed`,未使用产品全局 mutex。
## 仍需明确保留的验收缺口
- 没有在真实 Mentor 环境验证本轮恢复/导出功能。上述证据为回归测试及只读代码审查。
- 恢复写入入口中的旧地址,需要原生 inspection 确认;本次没有自动删地址,也没有仅凭文件不存在就确认释放。
- 无工程参数的外部原生会话仍是未确认;不能自动 Attach 到全局 COM 并操作他人的文档。
- 当前没有解决所有原生内容失败;本轮不表示 ICDB 自动修复或现场问题验收成功。
@@ -1,124 +0,0 @@
# ICDB 判定接口与本次检查失败的只读调查
日期:2026-11-05。基于 `1acfbd6`。本轮新增离线元数据探测脚本,读取安装的
类型库、PE 导出和既有日志;没有改变应用判定、打开工程、调用 Repair/Restore、
删除地址文件或终止原生进程。自动修复仍未验收通过。
## 结论
“打不开 PCB 并出现弹窗”是有价值的直接观察,但一般数据库打开失败、服务器
连接失败、版本恢复选择,都不能单独等同于 ICDB 数据损坏。现阶段最可靠的
ICDB 维护依据,是**本次打开的同一工程/数据库发出的明确原生诊断**。
尚未找到已验证、无需打开数据库、能直接预测 PCB 将发生 ICDB 故障的独立接口。
底层确有原生错误类别和错误码,但只有导出名称,没有取得对应 SDK 声明和
完整枚举,也没有建立真实故障与数字的映射;不能猜测参数调用后接入产品。
## 1. 已解析的 PCB 原生类型库
前一轮探测对 PCB 启动器执行 LoadTypeLib 失败,并不意味着安装缺少类型库。
本轮按 32 位注册表定位到:
```text
HKCR\TypeLib\{EDEDED00-D5F6-4B04-8FE7-EDEDEDEDED00}\1.0\0\win32
D:\Mentor\7.9.5EE\SDD_HOME\wg\win32\bin\XtremeDesignSessionWG.exe
```
成功读取 `MGCPCB (AutoActive series) Type Library`,共 614 个类型。没有创建
COM 实例,也没有连接正在运行的 PCB。
| 元数据 | 实际声明 | 能证明什么 |
| --- | --- | --- |
| `IMGCPCBApplication.OpenDocument(filename)` | 返回 Document,没有 ICDB 专用返回码声明,`scodeArray` 为空 | 可作为实际打开尝试;不能据声明直接解码 ICDB 故障 |
| `ActiveDocument` | 返回当前 Document | 空文档只表示尚未取得文档,不说明失败原因 |
| `IMGCPCBError` | `ErrorString`、`Severity`,没有 ErrorCode 属性 | 提供文字/严重级别;不是统一的打开错误码接口 |
| `EPcbErrorSeverity` | `epcbWarning=0`、`epcbError=1`、`epcbFatalError=2` | 是错误严重级别,不是三种 ICDB 健康状态 |
| `Errors` 集合使用方 | CopperBalancing、DFFSliverAnalysis、IDFImport、DXFImport | 不能把这些集合当成 PCB 启动错误队列 |
| 应用事件 | 打开前/打开后事件;`OnOpenDocument` 标志为 Open=1、Reload=2 | 没有声明 ICDB 打开失败事件和专用数字码 |
类型库没有专用错误表,不代表运行时绝不会返回 HRESULT/EXCEPINFO。真正执行
调用时仍应记录 HRESULT、EXCEPINFO 的 wCode/scode/source/description 和调用阶段,
但尚未实测的 HRESULT 不能赋予“数据库损坏”的含义。
## 2. 底层 iCDB 候选接口
静态解析 `iCDBPI.dll`、`iCDBDiagPI.dll`、`iCDBCAPI.dll`,三者均为 x86 PE。
`diagnostics/icdb-authority-20261105/metadata.json` 保存实际文件 SHA-256、
原始符号名称、类型库说明及常量,避免跨版本混用。
| 接口线索 | 已证实内容 | 未证实内容 |
| --- | --- | --- |
| `Result_get_iErrorCategory` / `Result_get_iErrorCode` / `Result_get_sResult` | 原生 Result 有错误类别、编号、文字 | 对象布局、调用约定、错误枚举及故障映射 |
| `CDBPI_IsOpenCDB` / `IsOpenCDBEx` | 存在数据库打开状态查询符号 | 未打开、不可达、损坏之间如何区分;不是已验证的健康检查 |
| `PIMgr_GetStatus` | C++ 对应声明返回/填写 `ESynchStatus` | 不能把同步状态当 ICDB 健康状态 |
| `Diag.GetProjectStatus` / `GetActiveIssues` / `GetStatus` | 存在诊断、工作区及项目状态接口 | 结构体、枚举、初始化方式、查询范围及副作用 |
| `Diagnostic.Check` / `CDBPI.IsDatabaseAvailable` | 存在相关诊断符号 | 参数语义、是否只读、超时/释放行为;未执行 |
导出名的存在不证明这是厂商支持的外部自动化 API。不能用 ctypes 默认 int
返回类型和猜测指针去调用这些接口;尤其不能在主界面线程内调用。
## 3. 本次“全部失败”的具体证据
旧记录:`diagnostics/live-open-20261105/evidence/icdb-check-1738989c1dae/`,
原生 PID `63480`,目标为 IP101GR 的 `Work/database`。
这次补读该 PID 的原生进程日志:
```text
D:\Mentor\7.9.5EE\SDD_HOME\standard\iCDB\ProjectBackup\Logs\
2026-11-05 08.08.40-63480\2026.11.05.iCDBProjectBackup.txt
```
日志从 08:08:41 读取该数据库的 ServerProperties,依次尝试所记录的多个地址
和主机名,端口 10002。08:09:14 报 `Network: ERROR: Could not connect to IP [...]`
后,再次读取同一数据库的服务器属性并继续重试。调查时读到的后续日志中仍有
相同循环。摘录和来源保存在 `diagnostics/icdb-authority-20261105/network-evidence.json`。
因此,这一次没有取得 Output 的直接线索是**原生工具正在反复连接数据库记录的
服务器地址**,不是仅仅窗口标题不匹配。此前允许通用标题的修改不足以解决它。
尚不能仅凭这些日志确定是服务器已退出、地址过时、监听配置或防火墙问题,
也不能证明数据库内容损坏,更不能据此确认目标无人占用。
同批另两项缺少唯一 PRJ,不能把它们与此连接失败合并成一个损坏结论。
本轮没有再次启动原库检查,也没有强制结束 PID 60000/63480。
## 4. 检测规则的遗漏与证据等级
安装 DLL 包含以下明确的原生维护消息:失联、整理中断、升级中断、重要操作
中断、跨机失联、自动修复中断,均带厂商的 Repair project 指引。
把这六段原生模板传给当前 `parse_session_loss`,只有跨机失联模板被识别。
这确认了规则覆盖范围偏窄;**模板存在不证明此次工程触发了这些错误**。
| 本轮实际证据 | 合理结论 |
| --- | --- |
| 同一数据库的完整失联/不一致/检查失败原生诊断 | 明确 ICDB 异常,记录子类、数据库路径、会话及证据 |
| 服务器地址重试、连接失败、一般 Could not run server | 连接/启动失败,尚不能认定损坏或无人占用 |
| `problem encountered while opening ...` / `loading ... failed` | 一般打开失败,还需具体数据库日志/弹窗 |
| Database Restoration 的手动/自动保存版本选项 | 需要用户选择版本,不自动判为损坏或代选 |
| Project Backup 未占用、备份目录已加载 | 占用/备份信息,不保证 PCB 完整打开或设计健康 |
| 无 Output、超时、未知错误 | 无法确认,不能推成健康或需要 Repair |
| READY/PENDING、地址文件、历史日志 | 均不能单独决定本次 ICDB 是否有问题 |
## 5. 建议的接入顺序与验证缺口
普通检验继续实际打开工程;同步捕获本次弹窗、增量日志和同一工程身份。
打开成功就继续普通检验,不以 Project Backup 预检作为其前置门槛;打开失败
仅在有明确 ICDB 原生诊断时标注 ICDB 子类,其他错误分别记录。检查结果不应
禁用普通检验或原生版本管理,也不据单项诊断设置永久的全库失败标志。
独立批量检查仍只做用户明确启动的检查。原生日志补采应绑定启动时间/PID、
目标路径和读取预算,保持增量及有界;网络日志中的“连接失败”不等同会话释放。
如果新检查不能退出,应显示实际滞留目标和原生连接阶段,不能靠伪造释放证明
继续对同一目标执行写操作。
下一轮动态探测应使用完整隔离库,分别记录正常打开、会话失联、文件损坏、
连接不可达、版本恢复选择的 PCB/原生证据;只运行诊断打开,不执行 Repair/Restore。
提取真实 HRESULT/EXCEPINFO 与原生文字的对应关系,并验证取消与正常关闭。
即使没有数字码,已确认的原生消息仍可用于分类;不能为等一个状态码阻塞普通流程。
本轮只验证元数据提取、既有日志关联和解析器覆盖范围,没有执行新的 PCB 打开
对照,没有验证底层 C API、解决原生网络重试或修复 ICDB。没有生成新应用候选包。
后续经用户授权完成了真实损坏/正常/缺文件对照,见
[损坏弹窗与错误码实测](2026-11-05-icdb-corruption-error-code-probe.md)。取得了 PCB
COM 两层错误码,但损坏与缺文件返回相同值,仍不能把该码当 ICDB 健康状态。
@@ -1,102 +0,0 @@
# ICDB 损坏弹窗与错误码实测
2026-11-05,Mentor EE7.9.5,PCB `2013.0.543.380`。按用户授权,只在新建的
`C:\Temp\CbbCodeProbe-7f1b0307` 内制造损坏。应用判定代码没有修改,没有执行
Repair、Restore、版本回退、集成或保存。
## 实测结论
成功触发数据库打开失败弹窗,并取得 `OpenDocument` 的 HRESULT 和 EXCEPINFO。
但**数据库损坏与文件不存在返回完全相同的两层错误码**,因此这两个数字不能
单独用于判断 ICDB 异常,更不能单凭它们自动请求 Repair。
| 对照 | `OpenDocument` 结果 | 外层 HRESULT | 内层 EXCEPINFO.scode | 原生证据 |
| --- | --- | --- | --- | --- |
| 未修改副本 | 返回正确工程文档 | 没有失败异常 | 不适用 | 工程身份匹配,数据库 GUARD OK,连接成功 |
| 损坏 `icdb.dat` 前 64 字节 | 失败,ActiveDocument 为空 | `0x80020009` / `-2147352567` | `0x8004021E` / `-2147220962` | 数据库文件打开失败弹窗;本轮日志明确指出损坏副本的数据库格式不受支持,并建议 Repair |
| 不存在的 PCB 路径 | 失败,ActiveDocument 为空 | `0x80020009` / `-2147352567` | `0x8004021E` / `-2147220962` | 文件不存在弹窗,没有数据库损坏依据 |
两次失败的 EXCEPINFO 全部字段相同:
```text
wCode: 0
source: Expedition PCB - Reusable Block
description: Failed to open document.
helpFile: ...\hssd\win32\bin\mgcpcbautomation.hlp
helpContext: 10187
scode: -2147220962 (0x8004021E)
```
外层 `0x80020009` 是 COM 调度异常。内层码在本次对照中表示通用的
`Failed to open document.`,尚不能赋予它 ICDB 专用含义。这里取得的是 PCB
自动化接口的错误,**没有调用未验证的 iCDB C API,也没有取得其内部 Result
错误枚举的可靠映射**。
正常、损坏、缺文件三种情况在等待 COM 注册时,都出现过
`0x800401E3` / `-2147221021`。正常副本随后成功打开,故此码也不能视为 ICDB
故障;它记录的是当时 COM 对象尚不可取得。
## 复现条件与证据
种子来自已有的隔离测试库:
`diagnostics/icdb-auto-recovery-20261027/verify-library`,不使用生产库作破坏对象。
完整复制得到 control 和 damaged 两份库,每份 21,029 个文件、557,187,955 字节。
复制后核对 LMC、PRJ、DXP、icdb.dat、PCB、LayoutDB 六个主要文件的 SHA-256。
仅在 damaged 副本清零工程 `database/icdb.dat` 的前 64 字节,其余字节保留。
正常副本和损坏副本在启动前彼此独立。
通过同一个原生入口启动空白 Reusable Block PCB,然后在专用私有桌面执行
`app.OpenDocument(绝对PCB路径)`。调用前核对 COM 主窗口 PID 的启动器父子关系,
记录 InstanceGuid,确认没有已有文档,且 PRJ/PCB 工程配置的 CentralLibrary
均解析到该副本自己的 LMC。没有创建生产库 COM 写会话。
正常对照 PID 15536,10:16:44 开始 OpenDocument,10:17:06 返回正确文档。
随后授权匹配的关闭助手执行 `doc.Close False`,未保存,正常退出。
损坏对照 PID 63384,10:18:10 开始 OpenDocument,10:18:51 取得异常。
弹窗原文:
```text
Problem encountered while opening one of the database files.
See PCBLogFile.txt for details. Loading of the job has failed.
Do you wish to view the log file now?
```
截图:
`diagnostics/icdb-authority-20261105/live-damaged/database-failure-75566502.png`。
先记录弹窗,再点击“否”关闭可选的查看日志提示,未发送修复指令。
本轮 `PCBLogFile.txt` 增量为:
```text
Database cannot be loaded and the server cannot be started, the project will
not be opened. Please use iCDB Project Backup 'Repair project' functionality
to fix this issue. (Database [C:\Temp\CbbCodeProbe-7f1b0307\damaged\
ReusableBlocksLP\IP101GR\Work\database\icdb.dat] in old, unsupported format)
```
“旧格式”是原生对被清零文件头的诊断文字;本试验没有证明实际存在版本过旧。
iCDBManager 同一 PID 的日志也指向该损坏副本。原生层先重复读取损坏数据库后
才显示弹窗;COM 异常在确认弹窗后返回,故不能只等 COM 异常而省略限时的
独立弹窗/日志观察。
缺文件对照最终 PID 61776,记录为 `live-missing-3174b7/com-result.json`,
10:25:08 发起调用,10:25:10 取得异常。首轮缺文件试验的单按钮提示未被助手
识别,助手按 180 秒上限停止,原生会话保留;之后核对窗口 PID 和明确的缺文件
文字,确认原生按钮 ID 为 2,正常确认提示并关闭空白 PCB。修正试验助手后重跑
取得上述完整错误码。该超时不是 ICDB 故障证据,首轮记录保留。
## 验证结果与边界
`diagnostics/icdb-authority-20261105/verify_live_probe.py` 对真实记录执行断言,
汇总保存在 `live-comparison.json`:正常文档身份、两种失败完全相同的 EXCEPINFO、
损坏弹窗与数据库路径、来源六文件哈希、损坏文件未被修复、测试进程退出及
已有原生会话保留均核对通过。三个最终试验都正常结束,前台窗口句柄前后相同。
没有剩余测试 PCB 或 iCDBNetServer;既有 Project Backup PID 60000、63480 保留。
检测可使用“实际打开失败 + 本次明确 ICDB 诊断 + 数据库目标一致”的组合证据。
文件不存在、一般打开失败和 COM 注册等待要分别记录。明确的单项故障只应
成为该项备注,不据此永久禁用普通检验或版本管理。
本次验证了**文件头损坏**,没有复现现场“先前服务器会话失联”,也没有验证自动
修复、READY 或完整产品维护入口。没有运行/宣称全量应用测试;本轮只增加
调查脚本与记录。不能将本次复现算作现场 ICDB 修复通过。
@@ -1,86 +0,0 @@
# ICDB 扫描按实际打开错误内容分类
## 当前行为
批量检查复用 PCB 诊断打开路径,不再先启动 Project Backup 检查所有条目。
诊断请求固定关闭自动修复、原生 Verify 菜单及恢复确认;只打开、核对目标并
正常关闭,不执行集成、保存、Repair 或 Restore。普通检验和原生版本管理
继续使用独立入口,界面既有 READY 排除规则保留。
只有实际打开错误中包含 iCDB 内容,或本轮原生日志明确给出 iCDB 错误,才
将该条目标为 ICDB 问题。通用错误码、工具内部类别名称、路径中出现 icdb、
成功输出以及历史错误均不能单独决定分类。没有 iCDB 具体原因的一般打开
失败仍保留原始错误和未确认结果,不显示成数据库损坏或健康。
正常打开只返回 CHECKED,不推定 CBB READY。单项失败在实际会话已释放后
继续后续项;未确认释放或用户取消时仍保留真实状态。没有增加永久的故障
锁,也没有把扫描结果作为普通检验或版本管理的前置条件。
## 重复扫描的证据
实机发现同一工程连续打开失败时,PCBLogFile.txt 可能逐字相同。仅比较内容
会把本次故障误当成旧日志。补充采集当前 PCB PID 对应的 iCDBManager 日志,
核对日志创建/修改时间、PID 头和目标数据库路径后,保留具体 ERROR 内容。
采集在既有的限时只读助手中执行,保留 16 KiB 头和最多 128 KiB 尾的读取
预算,不在 Qt 线程中等待日志,不递归扫描整个库,也不调用修复接口。
文件日志仍采用启动前检查点及有界增量读取;未知基线、无法确认历史的日志
重写,不提升为本轮证据。扫描只读取本次诊断子目录的错误证据,不能引用
上一次操作的证据目录来标记当前条目。
## 实际验证
使用上一轮完整复制的两个隔离库,通过应用的 `run_verify(maintenance=True)`
及 `run_batch` 执行真实生产调度路径。请求故意带旧 `auto_repair=True`,内部
诊断仍强制关闭修复。
- 损坏副本:保留清零前 64 字节的 icdb.dat。原生再次弹数据库打开失败提示;
扫描读取本轮 PID 3060 的日志,返回 FAIL / ICDB_REPAIR_REQUIRED,并保留
`in old, unsupported format`、目标数据库路径及日志证据。
- 随后正常副本:原生 PID 28948 打开正确工程,正常关闭,返回 CHECKED。
- 两项均 `safe_to_continue=true`、`library_flag=UNKNOWN`、恢复尝试为空;没有
请求 Project Backup、Repair、Restore、集成或保存。测试 PCB 和数据库服务器
均退出;没有终止已有 Project Backup 会话。
证据:`diagnostics/icdb-authority-20261105/product-scan-comparison.json`,以及
相邻的 `product-scan-damaged` 和 `product-scan-control`。首次复测暴露的重复日志
漏判记录也保留,没有清空故障日志来让测试通过。
回归覆盖实际损坏报文、未知 iCDB 错误内容、相同错误码的非 ICDB 失败、正常
输出、旧日志残留、日志重写、旧操作证据隔离、当前/其他 PID、日志新旧、
其他数据库路径、取消、会话未释放、失败后继续,以及原有界面/报告行为。
最终测试命令为 `python -X utf8 -m pytest -q`,1326 项通过,436.32 秒,保留一条
既有 pywinauto STA 提示;详细结果保存在同目录 `pytest-scan-utf8.xml`。
系统默认 GBK 模式的一次运行中,既有测试用默认编码读 UTF-8 报告失败;该项
在 UTF-8 模式下单独复测通过,未因此修改原生修复逻辑。
冻结候选包构建及启动/正常退出冒烟通过,16 个关键 Python 模块和两个 VBS
与源码一致,包内 x86 运行库及 Unicode/UNC 协议检查通过。使用冻结程序的
限时日志采集入口回放当前 PID 证据,确认能保留实际 ICDB 原因;未在冻结包中
再次执行整条原生扫描批次。独立候选包不覆盖此前的程序目录,未合并发布。
只读独立复核未发现必要 P1/P2,指出批量报告残留旧的 Project Backup 流程名称。
随后仅将该报告名称改为实际的 PCB 打开检查,并增加报告输出断言,104 项相关
回归通过;同步重建并复核最终 r2 候选包。完整回归记录保留在上述 XML,文案
修正后的相关回归记录为 `pytest-scan-post-review.xml`。
## 文件头损坏与版本管理
“版本历史与备份…”打开原生 iCDB Project Backup,入口只核对 LMC 和唯一 PRJ,
不以 icdb.dat 文件头可读作为准入条件。有效的完整历史备份包含数据库文件,
原生 Restore 可以替换损坏状态,而不是计算或补写丢失的 64 字节。
这份隔离样本的备份配置为相对 `./backups`,列出的多个历史 ZIP 中包含
`database/icdb.dat`。文件头非零仅是清单检查,不能代替原生验证备份有效性。
清单保存在 `version-backup-inventory.json`。
已有同类隔离实测中,原生 Repair 从已有备份恢复了该文件头损坏,随后重新
打开并验证成功;没有有效备份的对照则明确失败。见
[此前有备份的恢复记录](../releases/2026-10-28-icdb-open-repair-reopen-validation.md)
及[无备份的失败记录](../releases/2026-10-28-icdb-no-history-repair-validation.md)。
那次是 Repair 调用原生备份恢复,不等同于本轮已通过当前版本管理按钮执行
Restore;本轮没有选择恢复版本或发起恢复。
恢复会回到所选备份的内容版本,应保留原始损坏副本,恢复后重新打开并单独
检验。PCB 启动时“最后手动保存/自动保存”的选择不应直接视作工程 iCDB 已
恢复。没有有效恢复源时不能承诺恢复。现场会话失联和自动修复仍未验收通过。
@@ -1,58 +0,0 @@
# 管理、协调租约与状态扫描阻塞审计
审计范围:`library_lock.py`、`management.py`、`native_management.py`、`management_transaction.py`、`native_backup.py`、`network_path.py`、`batch_status.py`、`status_bridge.py`、`owner_probe.py`、`native_export_guard.py`、`icdb_ownership.py`、`native_occupancy.py`。本文仅说明这些边界,原生窗口清理、普通校验入口与界面由本轮其他修改覆盖。
本轮没有在该审计任务中启动 Mentor、Repair、Restore,未修改现场中心库,也没有删除原生地址、锁或数据库文件。测试使用临时文件和替代原生边界。
## 已落实的误阻塞修正
| 入口或条件 | 原误阻塞 | 修正及验证重点 |
| --- | --- | --- |
| `native_management.NativeOperationError`、`management.run_management.invoke` | 原生目录失败已退出,异常丢失释放事实 | 操作成功与释放证据独立传播;已退出目录失败可以重新取得协调锁 |
| `management_worker_main` | 桌面、映射、能力或来源校验在原生启动前失败,却报告未释放 | 原生启动前保持 safe;进入实际原生边界前才变为未确认 |
| `NativeManagementAdapter._worker`、`_launch_worker` | 请求准备或桌面构造失败制造假会话 | 准备失败为 safe;构造失败仅消费明确的 process_created=false、worker_exited=true、remaining_pids=[]、safe=true 协议;部分启动和缺证据仍未确认 |
| `NativeManagementAdapter._add_transaction` | Add 已退出后,路径、引用对齐、被动占用检查失败再次保留库锁 | 仅实际启动下一原生调用前重置释放状态;异常在租约退出前传播已知释放事实 |
| `NativeManagementAdapter.prepare_add_transaction` | 来源缺 CentralLibrary、staged/asset/lease 校验失败制造假未释放 | 原生 capture 前的完整准备块返回 safe=true 失败;capture 后准备事务记录失败保留 capture 的实际释放事实 |
| `management_worker_main` 的 CleanWGLib remove | wait 已退出但输出文件读取失败,或明确创建拒绝仍 unsafe | wait 确认退出立即记录 safe=true 与 exit_code;FileNotFoundError/PermissionError 的创建拒绝为 safe,未知创建错误和 timeout 保持未确认 |
| `management.run_management` | 移除后被动检查异常、报告写入异常把已释放改成未释放 | 保留释放事实;报告存储错误写入返回 detail;不重复抛出最终报告异常 |
| `management.RECOVERY_REQUIRED` | 目标数据恢复要求被混同为原生会话仍存活 | 可同时返回 RECOVERY_REQUIRED 和 safe=true;同目标禁止自动重放,明确不同目标不被旧数据恢复记录误挡 |
| `management._may_have_mutated` | 末阶段看似 prewrite 即忽略曾经写入的 history | 仅完整且一致的 prewrite history 可确认未写入;缺失、混合历史保持未知 |
| `LibraryLock.__enter__` | retained checkpoint 租约永远不再检查回调 | 同一租约 release probe 证明退出后,可清理身份相符且无未决 export/pending 的应用检查点并重新取得锁 |
| `NativeManagementAdapter.release_confirmed` | 超时 worker 后来正常返回仍永久保留 | 按库跟踪原 worker;只有它已退出且其独立结果 safe=true 才回收;缺失/损坏/unsafe 结果不推定释放 |
| `LibraryLock`、`release_retained_library` 的 CreateFile | 权限、网络、路径失败统一称 competing writer | 仅 Windows sharing/lock violation 32/33 分类为 LibraryBusy,其余保留实际错误 |
| `has_blocker` | 完整快照中的异库 pending 一律阻止 | 主记录与 pending 采用一致规则:只有完整、有效且明确搬迁的源记录可忽略 |
| `release_retained_library` | torn、malformed 应用检查点没有恢复路线 | 显式释放强制全库 fresh owner/native-file/export proof,复核原字节未变化,先归档再清应用 JSON;未知 proof 标记不足时拒绝归档 |
| `release_retained_library` 的范围 | 选择 Target 却清除全库旧检查点,可能漏 Other 真实会话 | 只有检查点和进程内 owner 都绑定相同 block_name 才使用所选目标范围;旧无 scope、范围不符、损坏记录一律 full proof |
| `_prove_library_released` 的目录范围 | 目标释放仍扫描所有 CBB,且漏共享 SymbolLibs | 已绑定目标时仅扫描目标 Work、共享 SymbolLibs 和所选 LMC;共享地址与数据库始终参与证明 |
| `_prove_library_released` 的 retained registry | 库 A 的 worker 阻止库 B | 新 worker 绑定 cbb_library;明确异库可排除;旧无 scope registry 保留未确认 |
| `_owner_matches_scope` | Work 子串匹配 WorkOld,worker 只带 job 路径时反而漏检 | Windows argv 精确路径边界;读取有大小限制的 worker 请求以绑定 library/project/database;没有可判定路径时不推定无关 |
| `_owner_matches_scope` 的 EDIF 命令 | 不识别产品实际 `-icdb <database>`,异库 exporter 被当全局未知 owner | 同时支持实际位置参数与 `-icdb=`、`-project=`,带空格路径和大小写按 Windows argv 解析,目录前缀相似不当作同库 |
| full known library process proof | 全机同名原生程序都被称本库占用 | 命令行明确指向异库可排除;无范围证据仍保持未确认;损坏检查点 full recovery 不使用范围排除 |
| `_persist_blocker`、`_recorded_supervisor_alive` | maintenance 只凭旧 PID 存在,PID 复用会误挡 | 新 version=1 记录附 machine 和 supervisor_created;只有进程创建身份匹配才称原监督进程仍在;旧身份缺失需额外 fresh native-idle 和原独占/目标 guards |
| maintenance 新 owner | retained 后缺 release_probe | 保存明确的 release callback,复用协调租约的再证明路径 |
| `BatchStatusSession.scan` | 单个请求/CBB/path mismatch 把后续未查询项全部标错 | 错配记录只属于当前项;支持 server 时先 restart 再逐项查询;已确认基础设施不可用仍批量标 UNAVAILABLE |
| `fingerprint_library`、batch record | 相同字节/时间的另一库或另一 block_type 复用旧 READY/PENDING | cache 绑定绝对库路径和 block_type;不 resolve 映射路径,不递归扫描工程负载 |
| `LibraryPathLease.close` | 映射查询或取消一次失败后 closed 永久为 true | 成功后才结束租约,瞬时失败可再次 close |
| `release_after_recovery`、`release_retained_path_leases` | retained mapping 永久不释放,旧界面丢引用后也不可回收 | 核对 RELEASE_CONFIRMED 与该库 display/mentor/已知 UNC 身份;registry 保留旧对象;共享当前映射先转移所有权再释放旧租约 |
| `WindowsWNetBackend.mapping`、`mappings` | 无关盘符读取失败让目标映射不可用 | 目标盘直接查询;全枚举跳过不可查盘但把它保留为已占用,避免抢占未知盘符 |
对应集中回归:`tests/test_management_retry_blockers.py`。既有管理、事务、租约、网络路径、状态扫描、导出与维护测试也纳入定向回归。
## 仍保留的真实互斥和未确认边界
| 条件 | 当前行为与可用路线 |
| --- | --- |
| uploader 或真实同库任务仍持有独占协调句柄 | 继续互斥;不删除 `.cbb-upload.lock`,文件中的旧 PID 文本不作为当前持锁证据 |
| 全局 `Local\\CbbRefreshVerify795` mutex | 仍序列化本应用原生 COM/管理操作。尚未证明所有 Mentor 全局状态可按库并发,未直接删掉此保护 |
| `native_management._catalog_com` 已有 LibraryManager.exe | 仍在 COM 激活前保守拒绝。尚无证据证明本机 DispatchEx 不会复用已有服务、Quit 不会关闭他人窗口;本轮仅修为 prelaunch safe,不声称已支持并存 |
| `_catalog_native` 激活后无 native_pids、原生 PID/退出状态缺失 | 仍未确认,可能 COM 已启动不可追踪服务。新请求不自动把空 PID 列表视为已释放;提供显式 fresh release 路线 |
| `native_management._wait_native_exit` | 运行时仍以已观察 PID 等待退出,未新增 Library Manager 全部后代的 JobObject/creation-time 追踪;超时转显式释放证明 |
| 旧无创建身份的外部/导出进程记录 | 不能把活 PID 直接证明是旧进程,也不能无条件忽略;新记录创建身份由本轮相应 exporter 修改提供。无法独立确认时保留现场与明确未确认原因 |
| `sAddress.adr` 仍存在 | 地址存在本身不证明当前活跃,但显式“释放”也不冒充原生 NOT_IN_USE。应走既有 inspection-only 的精确 project/database 原生占用检查;本任务不手删地址,也不自动 Repair/Restore |
| `owner_probe` 超时、访问受限、空 command、请求文件不可读 | 不把它称已确认活跃;也不猜已退出。明确异库证据可以排除;范围不明时保留未确认,并允许独立只读检查 |
| export ownership 元数据有效但副本目录/数据库缺失,或 token/lease 不匹配 | 仍拒绝自动清理,因为无法证明原副本的原生写入已结束;未知元数据恢复通路不能覆盖掉已知但尚未证明释放的 export copy |
| native backup 的自身 JobObject/子进程仍活动或查询失败 | `native_backup.py` 已使用 checkpoint=false;等待其自身会话树退出,不因主窗口/launcher 先退就推定全部释放,不 terminate/kill 原生事务 |
| 二进制 hash、flow、ASCII removal contract、来源/目标/证据隔离、Add nonce 和 duplicated lease handle | 继续作为能力或身份校验;它们不是 native busy。失败不授权绕过未验证原生写入路径 |
| 损坏检查点的全局 fresh-proof 路线 | 为弥补未知 scope,可能要求全机已知 native/app workers 均退出;这是显式未知记录恢复的限制,不适用于具有明确异库范围的普通重试 |
维护入口的 PID 创建身份、原生文件独占和 fresh guards 是不同证据:创建身份匹配只说明原监督进程仍在;创建身份不同/旧 schema 缺失只消除错误 PID 归属判断,不能替代原生或数据库释放证明。
@@ -1,37 +0,0 @@
# 中心库无活跃会话却被阻止(r5 现场反馈)
## 现场证据
用户运行 `blocking-locks-20261105-candidate-r5` 后反馈中心库操作仍提示上次未安全释放,扫描看不到活跃会话。
- r5 `data/logs/application.log` 中,15:54(北京时间)的 IP101GR PCB 检查因原生读写确认退出;相应 `session-release.json` 为 `safe_to_continue=true`、`worker_exited=true`、`remaining_pids=[]`。这次打开失败不等于释放失败。
- 随后版本工具 `native-backup-6bc7146a0eee/result.json` 为 `CLOSED / safe_to_continue=true / native_exit_code=0`,原生 PID60660 已退出。
- 中心库仍存在 11 月 4 日的 `.mentor_lib.cbb-upload.blocked.json`:PID57076、lease `eae80a06f23e4664b00c70b6bf81b01d`、`OWNER_RELEASE_UNCONFIRMED`。这是一条旧操作记录,并非当前进程存在的证据。
- 本轮只读实查:关联进程列表为空,协调文件可独占读取,库内没有 `sAddress.adr`,原有完整释放证明也通过。未为诊断删除源库任何记录或工程文件。
## 根因
`run_management` 在 `LibraryLock.__enter__` 因历史记录拒绝时尚未启动任何原生会话,但异常收尾用 `isinstance(error, LibraryBusy)` 强制把结果改成 unsafe。互斥通道尚忙也返回相同 unsafe。UI 随后把这一结果记为按库保留的 unsafe 标志,直接禁用后续管理;此时没有 PID 可供扫描。失败发生在创建本次 checkpoint 之前,也没有对应的管理尝试日志。
原残留扫描只列进程,不列历史 JSON 或 `checkpoint=False` 的进程内 retained lease,进一步造成“明明没有会话但永远不能继续”的表现。
## 修正
1. 有旧 JSON、同库进程内 retained lease、旧管理标志或未确认释放的历史修改时,在操作互斥范围内、任何新原生调用前执行已有完整释放证明。证明通过才归档本应用旧记录并释放本应用句柄;真实 owner、地址、共享访问冲突仍拒绝。未知归属不假定无人占用。
2. 管理尝试先记录 `release_check`;未启动的新操作被拒绝时保留本次 `safe=true`,不制造新的原生 owner。已启动原生后仍沿用实际退出证据,不能把超时统一放行。
3. UI 的旧 unsafe 标志成为重新复核要求,不再直接禁用管理。匹配当前库的证明且本批结果全部安全后,先恢复 retained 路径 lease,再清旧标志。映射恢复失败保留重试状态。
4. 扫描明确显示历史记录日期与内存保留记录,和活跃进程分开。空进程列表不再隐藏历史阻止原因。
5. 同目标历史修改未完成仍保留“需恢复,不能重放”;会话已释放与数据是否恢复分别处理。没有修改的 BLOCKED 结果不再触发额外原生目录读取。
6. 管理结果记录操作类型、CBB、状态、安全状态、原因及证据位置,包含启动前拒绝。
## 验证
- 按现场旧记录结构新增回归,初次 4 项均失败;修正后通过。覆盖无 owner 继续、真实地址保留、执行通道忙不制造 owner、空列表显示历史记录。
- 后续覆盖无 JSON 的 retained Verify 锁、匹配证明后恢复路径 lease、UI 可以再次发起复核。相关 **119 passed**。
- 实际隔离 UI 链路 `diagnostics/icdb-authority-20261105/legacy-management-a1c609ec/result.json`:从已验证原生 CRUD fixture 创建新隔离副本,预置相同旧记录与 UI unsafe 状态,通过应用“移除 CBB”确认入口完成复核、旧记录原字节归档、原生移除 IP101GR、重新读取目录确认缺失、UI 与路径 lease 恢复。**REMOVED / safe=true,59.016 秒,原始 fixture 全文件哈希不变**。生产库工程与旧记录未改动。
- 统一全量 **1518 passed**(`management-release-pytest.xml`,268.10 秒,1 条既有 STA warning);编译与 diff 检查通过。
- **r6 冻结复验通过**:`legacy-management-b3a65315/result.json`。控制层源码与包内字节码一致,真实管理 worker 与进程探测运行 r6 exe;相同 UI 链路返回 `REMOVED / safe=true`,原生目录再次确认缺失,旧记录归档、保留映射与 UI 标志恢复,原 fixture 未修改;96.313 秒。包内 26 个 Python 模块及 2 个 VBS、实际 GUI 启停、x86 codec 和包内 runtime 加载通过。
- 独立复核确认没有新增 P1/P2。候选包为 `dist/blocking-locks-20261105-candidate-r6/CbbRefreshVerify-Background`。
生产库的旧记录保留到用户下一次实际管理操作或确认释放时,由同一完整证明流程复核、归档。没有直接删除源库锁文件,也没有替用户重放增删改。不把本次阻塞修复算作 ICDB 数据自动修复验收。
@@ -1,27 +0,0 @@
# r9 补充审查:4 个已复现问题
本次只审查和构造回归复现,未修改产品源码、未启动 Mentor、未操作真实库。源码与 r9 BUILD.json 的 SHA-256 比对另行确认。先前 1,564 项测试通过没有覆盖以下组合场景。
复现:`python -X utf8 -m pytest -q diagnostics/icdb-authority-20261105/test_r9_remaining_review.py --junitxml=diagnostics/icdb-authority-20261105/r9-review.xml`。四项均在预期断言处失败,收尾完成,无残留测试线程。
1. **P2:停止整队列不会取消后台检查。** 后台 Beta 检查期间提交前台任务,再点击“取消当前任务并停止队列”。`request_stop()` 在 busy=true 时只设置前台 stop,没有设置 IcdbCheckTask.stop。前台任务取消后后台继续执行 Gamma。实测 calls=['Beta', 'Gamma'],期望仅 ['Beta']。位置:`ui/main_window.py:1484`。
2. **P2:排队项目变成 READY 后仍重复检查。** 检查启动时捕获目标列表,后续权威刷新将 Gamma 更新为 READY,恢复执行时只检查 invalidated,未重新核对 READY 操作资格。实测 Gamma 仍进入 verifier。用户要求 READY 即使被勾选也应排除。位置:`ui/icdb_check_task.py:66`、`ui/main_window.py:781`。
3. **P2:释放失败被误显示成读写确认。** 注入 `DATABASE_SAFETY_STOP` 和原始错误 `PCB_RELEASE_UNCONFIRMED: launcher still running`,表格固定显示“未确认:需处理读写确认”。该分类也包含普通会话释放失败,不能据此断定存在读写提示。位置:`ui/main_window.py:819`。
4. **P3:普通校验排队时隐藏后台检查进度。** 检查 Beta 仍运行时提交普通 Gamma 校验;`_run(maintenance=False)` 无条件隐藏 icdb_progress 和 icdb_phase,后台任务仍活跃。实测 isHidden=true。位置:`ui/main_window.py:1215`。
建议先修 1、2,再修 3、4;把这四个复现并入正式 tests 后复测。没有依据将这些结果扩大成数据库损坏或“所有释放又失败”。
仍保留此前验收缺口:ICDB 自动修复、现场服务器失联完整恢复以及 Windows 10 关键流程没有因本轮检查验收而变成通过。
## r10 修复
- “停止队列”同时取消后台 ICDB 任务和当前前台队列;独立“停止检查”仍只取消 ICDB 检查。
- 每项在真正取得原生执行机会后检查最新 READY 集合。权威状态读取在让出队列之前发布状态,不等待界面回调;重新加载和局部状态刷新均按库匹配,其他库的同名 CBB 不受影响。
- 仅本次错误明确含 read/write access permission 时显示读写确认;释放未确认和其他安全状态分别显示,原始错误保留在提示中。
- 普通校验排队时保留活跃 ICDB 任务的进度条和阶段标签。
4 个原始复现已转入 `tests/test_background_queue_regressions.py`,修复前均红,修复后均绿;另补权威状态在 Qt 回调前发布、跨库同名隔离以及不同安全原因显示,共 10 个回归。第一轮相关 49 项通过。产品源码仅修改 `ui/main_window.py`、`ui/icdb_check_task.py`;具体最终测试、冻结和原生验收见 r10 的 VALIDATION.json。
最终全量 1,574 项通过(0 失败、0 错误、0 跳过);有既有 pywinauto STA COM 初始化提示 1 条。编译和 diff 检查通过。r10 冻结包 37 个模块/脚本与源码比对、GUI 启动冒烟和包内 x86 状态桥运行库加载检查通过。
r10 实际冻结执行器隔离批次通过:损坏项 FAIL / ICDB_REPAIR_REQUIRED / safe=true(68.563 秒),随后正常项 CHECKED / safe=true(26.812 秒);无关的同桌面模态窗口未被操作,来源六文件哈希不变。实际界面按钮检查及排队状态读取通过,顺序 check-start → check-end → status-start → status-end,筛选可用,最终 READY,50ms 定时器最大间隔 79ms,整体 23.656 秒。目录行的初始 PENDING 为测试注入,原生打开和状态读取实际执行;不冒充现场服务器失联恢复验收。
@@ -1,90 +0,0 @@
{
"review_comment": "https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/3#issuecomment-249",
"version": "0.2.4b1",
"base_main": "a56fd17b60d9f67997d7f48c862f3367d4502f84",
"tests": {
"infrastructure": {
"tests": 491,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_sha256": "12c2cd40542cb01d4fa374e98908c8a77a8deb83f95d0833645b1666ea5574e9",
"xml_file": "codex-review-infrastructure-pytest.xml",
"seconds": 52.986
},
"native_backend": {
"tests": 1376,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_sha256": "8db65d11dd918d2a1b141d72627654a990ea903b68e20511e982dfb927d6be58",
"xml_file": "codex-review-native-backend-pytest.xml",
"seconds": 275.957
},
"ui_integration": {
"tests": 1545,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_sha256": "5a3e6d58d611240c6e34cc9bd2350a8bf605516ef453240333836c1f88233af6",
"xml_file": "codex-review-ui-integration-pytest.xml",
"seconds": 325.065
},
"final_stack": {
"tests": 1601,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_sha256": "bab74328facfbf512416b62a074fb5cb65ea39b04f0039d42083f96b5349c351",
"xml_file": "codex-review-residual-release-pytest.xml",
"seconds": 246.75
},
"umbrella": {
"tests": 1601,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_sha256": "566f50b4ba537d4e54939946a5b48cad9ed6dbd8fb69c5ffbabcc5da0fbaf507",
"xml_file": "r10-pr-pytest.xml",
"seconds": 313.479
},
"force_boundary": {
"tests": 43,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_sha256": "832425306b5fea3a150cc2188e00c97a771bb6d953e54b69c091d36e8062dca9",
"xml_file": "pr249-force-focused.xml",
"seconds": 3.231
}
},
"compileall": "passed",
"git_diff_check": "passed",
"final_content": {
"file_count": 195,
"sha256": "2784b81ff0ae4d47f85ac8ea4b217292bbd9a1e716667e729863bfd4a6a372cd",
"umbrella_equals_stack": true
},
"post_test_formatting": "MainWindow line endings aligned with UI review base (AST equality asserted); unchanged README lines retain main line endings",
"regression_red": {
"baseline": "e4266ae",
"selected_new_ownership_tests": 3,
"expected_failures": 3,
"method": "in-memory baseline module; no production files or native processes modified"
},
"force_contract": {
"clients_only": true,
"same_user_sid_and_windows_session": true,
"servers_never_terminated": true,
"durable_consent_before_action": true,
"independent_library_release_proof_required": true
},
"not_validated": [
"field server-session loss recovery",
"Windows 10",
"cross-machine shared-library concurrency",
"actual Mentor force termination",
"new frozen package"
],
"delivery_policy": "Draft review only; no merge, publish, automatic issue closure or native production-library operation"
}
@@ -1,127 +0,0 @@
{
"candidate": "r10",
"candidate_base_commit": "1acfbd637452e8f64d96981044194661dfb4ec1b",
"python_full_suite": {
"name": "pytest",
"errors": "0",
"failures": "0",
"skipped": "0",
"tests": "1574",
"time": "207.493",
"timestamp": "2026-11-05T21:09:55.032807+08:00",
"hostname": "Abs"
},
"frozen_modules_and_scripts_compared": 37,
"native_check_statuses": [
"FAIL / ICDB_REPAIR_REQUIRED / released",
"CHECKED / released"
],
"native_check_seconds": [
68.563,
26.812
],
"foreign_same_desktop_modals_untouched": true,
"source_primary_files_unchanged": true,
"gui_native_queue_order": [
"check-start",
"check-end",
"status-start",
"status-end"
],
"gui_cached_filter_available": true,
"gui_max_timer_gap_seconds": 0.079,
"automatic_icdb_repair_acceptance": false,
"field_server_session_loss_acceptance": false,
"tested_environment": "Windows 11 / Mentor EE7.9.5",
"candidate_code_sha256": {
"src\\cbb_refresh_verify\\application.py": "babeefe4ddc2fb78b4af3a0413f60cb351eeca57f6f2862e2bc1b8a94de59f32",
"src\\cbb_refresh_verify\\backup_recovery.py": "ea7bb90151e825efb6163e43ed344b62407565005f0a0459c423ba2205539373",
"src\\cbb_refresh_verify\\batch_status.py": "918c80dd4f75146baa6b7616ce415ac89ee28f6c1f46b2bfda77bacc998b5b62",
"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": "19aaec03822468b18099f358a5aac3433346ff81345b58a896545bf508840e3d",
"src\\cbb_refresh_verify\\desktop_worker.py": "3b79dcab16b67b68550957c09c9de1ba08d85109356274c8cff4d0ae02dec3fb",
"src\\cbb_refresh_verify\\diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072",
"src\\cbb_refresh_verify\\dialog_agent.py": "6a9b9802912afc4dd670ee9b28845d97bd64fe55fd577815ef729850fcff78db",
"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": "6ab1d469b09e92641ff60a4b6acd4cc13d40cc200a6fae880e864181526994c4",
"src\\cbb_refresh_verify\\icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03",
"src\\cbb_refresh_verify\\icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360",
"src\\cbb_refresh_verify\\integration.py": "86669ad73ae1d2d724d406c3644bb0c297236a4ffdc4b66117930ec660613e88",
"src\\cbb_refresh_verify\\library_lock.py": "315b3cba411713aea870b0a773b3cb986be73b85b88732d8cd82862f22f650db",
"src\\cbb_refresh_verify\\library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195",
"src\\cbb_refresh_verify\\library_reader.py": "47d58d1518ba7e69c22b41db2d34c0a61e2cc1362cf28414f0dae43d4a011753",
"src\\cbb_refresh_verify\\maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990",
"src\\cbb_refresh_verify\\management.py": "64e6fc1382092f1d2154052ec456b9c511934d3f2b231a163be28dca27eb3873",
"src\\cbb_refresh_verify\\management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0",
"src\\cbb_refresh_verify\\mentor_adapter.py": "26a73074ef162d240c80747e371f357c8ec87b00cdbbd3509acc4ac58e68e955",
"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": "a241bc3be7dc5a922ce728f1febd3684e79e6e45935589c80a4b1a5933e05df5",
"src\\cbb_refresh_verify\\native_export_guard.py": "5120c13e4ef1255d4c61316eb40005c4039c23e41edca4437bd0ef28b543a959",
"src\\cbb_refresh_verify\\native_management.py": "bdb42f0bbbc964e56cfe08f66804a03dfc73157eb98911531c9d4c8f940c7595",
"src\\cbb_refresh_verify\\native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49",
"src\\cbb_refresh_verify\\native_repair.py": "65d3e5b28b1f375402b002f56527dafbcc79e21cea66822e3bc26332d59e76d7",
"src\\cbb_refresh_verify\\native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393",
"src\\cbb_refresh_verify\\network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f",
"src\\cbb_refresh_verify\\operation_queue.py": "57ad9da8aeedd9cd75a8c5b5fda44044bcb457670a4a323e9e8bb247198074ab",
"src\\cbb_refresh_verify\\owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903",
"src\\cbb_refresh_verify\\pcb_bridge.py": "745ef117e984021e8a3d9087a2783c1efe19bed97edcfbcfae7703a291cc6eaa",
"src\\cbb_refresh_verify\\pcb_restore_prompt.py": "5342612ad666e3faf5a9a4ce4710e9af458d357c44037135f2837dad436d5cf7",
"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": "5fa8a0f87d6aa4c7e0dec4ab8eb1d649d20fdbea35016fbd65fefefd42607eef",
"src\\cbb_refresh_verify\\runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e",
"src\\cbb_refresh_verify\\runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367",
"src\\cbb_refresh_verify\\save_verified_block.vbs": "2ede0a1297e44533cd6333b775cdd70c86b5f2aaaaa18ccd6df158379ef1fd31",
"src\\cbb_refresh_verify\\scoped_manifest.py": "54cf4288e7850e220b394ae971ea98785eba631f80784a3f9354209e649f6498",
"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": "bb5bae2616e3440a6adc083a2a6941176205f574fde077cf89a6121077833fed",
"src\\cbb_refresh_verify\\__init__.py": "be4027b9b6c4659a7f7d499a14f75ec84c410bd9a706d9ffd9f97d44a52b3806",
"src\\cbb_refresh_verify\\__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0",
"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": "621ea2efea85367b0c9bb9790040860a1ac001f40f8834289cb67c96ea0648d1",
"src\\cbb_refresh_verify\\ui\\icdb_check_task.py": "03e6416ee3d2fa11ecedb624a558516eeb56e634f1f22e41e57e10db6a13d656",
"src\\cbb_refresh_verify\\ui\\main_window.py": "4526f59b7f26374ff119d45453b278780a51ef7632eb1611c4e06a205cd30795",
"src\\cbb_refresh_verify\\ui\\management_dialog.py": "27d920284e508f19fae71b04a3b3d81a251559d52c4cc8d691c41186686572b7",
"src\\cbb_refresh_verify\\ui\\pcb_restore_dialog.py": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da",
"src\\cbb_refresh_verify\\ui\\residual_release_dialog.py": "515aaa236ad6a0bee9e5383c6c9d093baeb8bc7dc98f1b978b1197ce672c6764",
"src\\cbb_refresh_verify\\ui\\workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888",
"src\\cbb_refresh_verify\\ui\\__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
},
"scope_note": "Candidate icons are local workspace assets and are excluded from this change. Native evidence files and engineering copies remain local.",
"pr_integration": {
"base_commit": "a56fd17b60d9f67997d7f48c862f3367d4502f84",
"python_full_suite": {
"name": "pytest",
"errors": "0",
"failures": "0",
"skipped": "0",
"tests": "1582",
"time": "194.662",
"timestamp": "2026-11-05T21:54:33.463053+08:00",
"hostname": "Abs"
},
"compile_check": true,
"diff_check": true,
"candidate_code_differences": [
"src\\cbb_refresh_verify\\mentor_adapter.py"
],
"difference_scope": "Merge main: defer private desktop allocation into protected cleanup in the two legacy status readers; retain PCB diagnostic/integration behavior.",
"both_cleanup_regression_suites_preserved": true,
"candidate_rebuilt_after_main_integration": false,
"automatic_icdb_repair_acceptance": false,
"field_server_session_loss_acceptance": false
}
}
@@ -1,75 +0,0 @@
{
"date": "2026-11-06",
"review_comments": [
275,
283,
286
],
"tests": {
"backend_full": {
"tests": 1385,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_file": "cbb-refresh-verify-795-backend-fixes-fixes.xml",
"xml_sha256": "b1af9d0025abbbbcf25fe134b02da980c9402dd22c0fa39e1f96b9f8124183ee"
},
"backend_read_guard": {
"tests": 9,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_file": "cbb-refresh-verify-795-backend-fixes-fixes-focused.xml",
"xml_sha256": "25dac539945d9ba71f2f9dafeb342e8f6110e094c62364369013e16e551b1f94"
},
"ui_integration": {
"tests": 29,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_file": "cbb-refresh-verify-795-ui-fixes-fixes.xml",
"xml_sha256": "9eeeff28c6fcd31d8f2e6d7fb38e0bdf01b0058ba7b7f9e5df2f173f71a4fca0"
},
"final_integrated": {
"tests": 1631,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_file": "cbb-refresh-verify-795-review-stack-fixes-full.xml",
"xml_sha256": "7d75049e4feecb4a6026062321d4a0fcb1c92e30f8f1ba23d11a4ea28ee19c9c"
},
"final_release_focused": {
"tests": 63,
"errors": 0,
"failures": 0,
"skipped": 0,
"xml_file": "cbb-refresh-verify-795-review-stack-fixes-focused.xml",
"xml_sha256": "469923faf0919ab2e3dffac183f2cb44a6b606aa15edacce92a88da1bde81424"
}
},
"compileall": "passed",
"git_diff_check": "passed",
"source_and_tests_sha256": "6fe6f02a3e0e731c4c9d2ff2f2c5e86e537139ef5e59f15441a9059522109526",
"post_full_suite_change": "GUI proof path comparison now uses lexical absolute paths, with no filesystem resolution; final 63 release regressions cover this one-line change. No further full-suite run was performed for this isolated UI comparison.",
"ui_preview": {
"file": "2026-11-06-release-preview.png",
"sha256": "e13645ed6b8234a2d46f6c462a262c7ef2092459c8e94f60a9fa273fd02c3613",
"mode": "offscreen simulated sessions; local Windows fonts loaded for visual inspection"
},
"red_regressions": {
"initial_backend": 6,
"initial_release": 12,
"ui_outcomes": 2,
"additional": "report storage, prelaunch evidence/probe timeout, cancel release propagation"
},
"scope": "Historical records trigger actual ownership proof; no automatic repair, server termination, native lock/address deletion or library backup.",
"native_cancel": "Only a unique enabled standard Cancel/取消 (IDCANCEL=2) on a current matching Project Backup window; identity, user/session, title, desktop and button rechecked; request does not prove cancellation.",
"not_verified": [
"actual Mentor native cancellation",
"actual Mentor force termination",
"field ICDB recovery",
"new frozen package",
"Windows 10",
"cross-machine shared-library concurrency"
]
}
@@ -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.
-39
View File
@@ -1,39 +0,0 @@
# v0.2.4-beta.1(0.2.4b1)开发候选说明
状态:待评审、待现场验收。不是自动发布指令,工单保持开放。
## 用户可见变化
- 检验、ICDB 维护、中心库管理为独立入口。ICDB 检查在后台逐项运行,其他原生任务可排队,搜索/筛选保持可用。
- 检查以当前 PCB 打开情况和本次原生错误为依据,只有明确 ICDB 错误才标记问题;不自动 Repair、Restore 或选择版本,CHECKED 不等于 READY。
- 停止队列同时停止后续后台检查;执行前再次排除 READY,校验排队不隐藏检查进度;释放失败显示实际原因。
- 原生新增、同名替换、移除和备份恢复继续要求确认及人工备份,失败结果和未完成任务逐项保留。
- 默认残留释放为正常关闭。单独确认的强制结束仅允许属于当前 Windows 用户和会话、已确认作用域和精确身份的受支持文档客户端;服务器、后台导入器和未知进程不可强制结束。
## 强制客户端操作的契约
支持 Expedition PCB、Library Manager、viewdraw 和 iCDB Project Backup。操作员须知晓客户端中其他工程可能一并退出、未保存更改可能丢失、写入中的工程可能需要恢复。确认名单先持久记录为库外 `consent.json`,失败则不执行;派发处复核身份和预览范围,句柄处复核创建时间、完整映像、用户 SID、Windows 会话与原生活动;变化时拒绝。
数据库服务器可能服务同库其他用户,命令行归属不构成独占授权。本工具不会强制结束任何 ICDB 服务器;它仍活跃或库状态未知时保留 PARTIAL,不能通过结束客户端伪造释放或修复成功。
## 安全状态和回退
单项失败且本任务确已释放时可继续独立项;未释放时保留现场、检查点、映射和证据。客户端强制结束不可撤销,恢复使用人工一致备份或原生历史版本;不会自动重新导入、回退共享库或重放未完成写操作。
程序回退:先关闭正在使用的客户端,再使用此前候选包;程序回退不恢复原生事务或丢失更改。工程恢复:保留故障现场、选择确认过的备份,在隔离副本验证后恢复并重新校验。
## 验证与限制
PR #3 comment 249 的修复通过服务器排除、确认记录失败、PID 复用、客户端/服务器混合名单等 fake 边界回归;没有为了验证本功能终止真实 Mentor 客户端或服务器。
此前 r10 的原生隔离检查与界面排队证据只证明该候选包已记录的打开/释放行为,不能当成新强制客户端功能的现场验收。现场服务器失联恢复、ICDB 自动修复、Windows 10 和共享库跨机器并发仍未验收。
规范:[SOP](../../SOP.md)、[ICDB 手动修复手册](../ICDB-MANUAL-REPAIR-AND-UPDATE.md)。依赖和拆分顺序见 PR #3 的独立审查链。
## 2026-11-06 审查修正
- 校验和管理统一复核历史占用,释放经过先留证;PASS 不再重复计入无法确认。
- 管理增加目标工程及共享依赖的写后差分,明确不覆盖其他 CBB 内容;报告失败不制造未完成原生事务。
- 释放逐项持久保存,快照异常保留已完成/未执行项;报告保存失败与独立释放证明分别展示。
- 预览与强制执行前读取原生活动,正在 Backup/Restore/Repair 或无法确认的备份客户端不可强制结束;显示后台提示、映像路径与桌面,并对唯一已识别的 Cancel/取消按钮提供确认请求。取消后的实际状态仍需复核。
- 本轮自动测试不包含真实 Mentor 的强制结束或原生取消验收;ICDB 自动修复继续暂停。
-13
View File
@@ -1,13 +0,0 @@
# 独立审查 1:只读进程探测与原生任务准入队列
基于 main `a56fd17`,不叠加 PR #3 的历史提交。
**行为变化:** 增加有界、版本化、只读 owner-probe helper 和可取消的 FIFO 原生任务队列。应用仅新增隐藏的只读 helper 分派;现有 UI、验证和原生写操作保持原来的入口。
**失败安全:** 查询超时或协议/身份异常返回未确认;暂停或取消的队列票据不会运行其动作,也不阻止后面的可执行任务。不启动或终止 Mentor 进程。
**回滚方式:** 尚未合入下游时撤销本提交即可;下游接入后须按依赖从上层向下回退。
完整回归:491 passed,1 条既有 pywinauto STA 提示。编译和 diff 检查通过。
与原评论建议的差别:`management_transaction` 直接导入管理模型和库锁;`scoped_manifest` 的协调记录与独占快照依赖库锁协议。这两者在后端审查中一起交付,避免构造导入不完整的“纯工具”基线。
-20
View File
@@ -1,20 +0,0 @@
# Native backend review unit
Base: codex/review-infrastructure. This unit integrates ICDB open diagnostics, scoped content manifests, native CBB transactions and the library-release protocol; it does not expose the new UI or residual termination action. Verification and ICDB checks remain separate, READY items are excluded from maintenance, and a released single-item failure can continue independent targets.
Failure safety: no automatic Repair/version choice, no server termination, no direct LMC edits or native lock-file deletion. Native writes are serialized, uncertain ownership retains evidence and mappings, and unfinished writes are shown without replay.
Dependency rationale: library release imports native engineering identity and retained management workers; engineering identity imports management source models and scoped manifests. Separating these into nominally independent utilities would leave runtime imports unresolved. This PR therefore keeps the backend dependency closure together; UI and user-confirmed termination remain separate later PRs.
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,9 +0,0 @@
# Residual release contract review unit
Base: codex/review-ui-integration. Behavior: expose the residual-session preview and cooperative close entry, plus a separately confirmed force action limited to recognized document clients of the current Windows user and session. Database servers, importers, unknown scope and unverified identities cannot be force ended. Version becomes 0.2.4b1, with README, SOP, manual and rollback notes aligned.
Failure safety: persist the exact allowed/excluded confirmation list before any native action, recheck scope/creation/executable/user/session at dispatch and the held handle, and require independent library-release proof after exit. Unreadable owner metadata disables force only. A terminated client is not a repaired/READY project; partial release retains evidence and mappings.
Rollback: reverse the dependent commits before reverting the backend, or close the current app and use the earlier candidate. Process termination cannot be undone, and code rollback does not restore native transactions or unsaved data. Use a consistent manual backup or an explicitly chosen native history version on a copy.
Validation: 1,601 passed for this final stack, 1,601 passed for the umbrella, and 43 focused release tests passed after the final UI wording change. Compileall, diff checks and byte-level final implementation equality passed. Detailed XML counts/hashes and content digest are recorded in ../releases/2026-11-05-pr249-review-validation.json. No real Mentor client/server was terminated for these checks. Field recovery, Windows 10, shared-library concurrency and the new frozen package remain unverified.
@@ -1,9 +0,0 @@
# Application integration review unit
Base: codex/review-native-backend. Behavior: verification, ICDB batch checking and CBB management have separate tabs; background checks yield between items, keep browsing responsive and let other native tasks queue. READY targets are excluded at execution, status refresh is scoped, and manual version/copy decisions remain explicit.
Failure safety: a released item failure can continue independent targets; uncertain native ownership retains evidence and mappings. There is no residual-session release backend in this review stage: its button and result actions are hidden, and its callback is inert. The next PR restores the complete release entry together with its tested backend, rather than exposing a button with a missing import. No automatic Repair or native version selection is added.
Rollback: revert this UI commit before its dependent release PR; after dependents, revert in reverse order or close the current program and use the prior candidate. This does not roll back library writes.
Validation: 1,545 passed (one existing pywinauto COM-threading warning), compileall and diff checks passed. Release-specific tests are introduced in the dependent PR, never discarded from the final tree. Windows 10, real shared-library concurrency and field ICDB recovery remain pending.
@@ -1,9 +0,0 @@
# 评论 275:占用复核与变更报告
校验和管理共用历史释放记录复核:旧 JSON/内存租约触发实际进程、地址、独占文件和导出副本证明,不直接视为真实占用,不结束进程或执行 Repair。确认释放后归档旧记录并继续;失败且本项尚未启动时保留原记录,结果不会把本项标成未释放。校验结果兼容新增 release_proof,管理首次原生调用前保存释放经过;进程释放不等于历史数据已恢复。
写后仅对原先的目标 Work/Cert、中心库配置和共享依赖范围生成 SHA-256 差分,报告新增、删除、修改路径,并保存写后清单。范围沿用原有 ManifestScope.library,不增加整库备份或其他 CBB 内容哈希,不声称已证明所有其他 CBB 未被波及。已释放的部分失败也保留差分;仍有原生所有者时不为报告读取数据库。报告失败单独标为 UNCONFIRMED 并返回原因,不伪造未完成事务、不制造永久占用。
PASS 不再重复计入 unconfirmed。未改变实际原生写操作、人工备份政策或服务器保护,也没有恢复自动修复。
回归覆盖历史记录无占用/真实地址占用、首次原生调用前留证、目标及共享依赖差分、失败后差分、报告保存失败后可继续。完整回归和限制以最终验证记录及 PR 描述为准;真实 Mentor、Win10、跨机器共享库尚未因此取得新验收结论。
@@ -1,11 +0,0 @@
# 评论 286:释放留证与原生活动
释放前持久保存 NOT_STARTED 检查点,动作前保存 REQUESTING,动作后逐项保存实际状态,快照超时/中途异常也保留已执行和未执行项。保存失败停止继续发出动作;最终保存失败明确标为 PARTIAL/evidence_error,但独立且匹配当前库的释放证明仍被界面接受,不伪造占用。确认意图 consent_allowed 与实际 release_status 分别记录。
强制结束预览及精确句柄处重新读取原生窗口、进度和 Output;备份客户端进行中或状态无法确认时拒绝强制结束。普通客户端的保存模态窗口不直接等同于正在写库。服务器、导入器和未知身份仍排除。
窗口快照记录桌面,预览展示完整映像路径并提供原生提示/输出查看,支持原有保存选择。仅在当前用户/会话、精确进程身份匹配,且当前备份窗口唯一存在启用的 Cancel/取消(标准 IDCANCEL=2)控件时,提供单独确认的取消请求;执行前再次匹配标题、桌面、窗口和按钮并校验 PID。该请求复用串行准入和库外留证,不能当作已取消/已释放/已修复,也没有未知菜单或前台鼠标回退。没有可识别控件时入口禁用,保留状态供重新检查。
回归覆盖初次/末次快照超时、逐项记录、报告落盘失败、活动状态变化、原生取消按钮变化、确认与取消选择、已释放事实不被报告错误覆盖。测试使用临时文件和 fake 原生边界,没有终止或取消真实 Mentor 事务。原生取消在具体 Mentor 版本/现场窗口上的效果仍待隔离实机验收;ICDB 自动修复继续暂停。
回退代码不恢复已结束进程或原生事务;工程数据恢复仍需一致人工备份或明确选择的原生历史,不自动重放写操作。
-7
View File
@@ -1,7 +0,0 @@
# 评论 275/283:结果口径接入
管理进度显示历史占用复核;结果分别呈现已确认的原生动作、变更清单完整性和历史会话释放事实。单项 RECOVERY_REQUIRED 但 safe_to_continue=True 时,不再声称整个队列停止;记录失败不伪装成原生上传/移除失败。
独立操作回归更新为实际历史记录归档流程:先证明当前占用已释放、保留归档字节,再进行普通验证;不自动 Repair,失败后不遗留新的占用锁。
本阶段相关 UI/独立操作/后端回归 29 passed。后端完整回归与最终集成回归另见验证记录。没有执行真实 Mentor 写操作;回退按依赖逆序,不代表恢复原生事务。
@@ -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,56 +0,0 @@
# PR #3 comment 249 implementation plan
**Goal:** Make the force-release contract explicit and keep shared native servers out of forced termination; replace the large PR as the merge entry with smaller, ordered review branches.
**Authorization:** The user requested implementation of comment 249. Earlier user decisions retain explicit user-confirmed residual release, manual backups and no release/issue closure before field acceptance. These decisions take precedence over changing Draft status merely to make a merge button available.
**Architecture:** Keep automatic verification and checking cooperative. A separate explicit force action can end supported document clients only after scope, exact process identity, current user SID and Windows session are checked. Native database servers and unknown processes remain observable and cannot be force terminated. Every force request must persist consent intent before any termination and still obtain independent library-release proof afterward.
**Review split:** Preserve #3 as an unmerged umbrella. Create a dependent review chain: (1) read-only owner probing and cooperative queue; (2) native backend, manifests, library coordination and transactions; (3) background checks and application UI integration; (4) residual-session release, its explicit contract, version and documentation. `management_transaction` imports management and lock APIs, and semantic manifests depend on recognized coordination checkpoints; they belong with the backend rather than pretending to be standalone read-only utilities. The existing #5 remains a prerequisite document review, not an automatically merged change.
## Global constraints
- Python/PySide6, Windows and Mentor EE7.9.5 remain the supported implementation stack.
- Never kill native servers or operate production libraries in this development task.
- No automatic Repair, Restore, version choice, issue closure, publishing or PR merge.
- Each split PR states visible behavior, failure safety and rollback.
- Preserve the current user test workspace; work in the PR worktree.
## Task 1: Force-release boundary
Files: `residual_sessions.py`, `ui/residual_release_dialog.py`, `tests/test_residual_sessions.py`, `tests/test_residual_release_dialog.py`.
- [x] Add failing tests: a scoped iCDB server cannot reach `_force_close`; direct force requests against server/unsupported names never obtain a terminate-capable handle; missing consent evidence causes zero termination calls; mixed client/server previews list only supported clients in the confirmation; rejected/reused process identities remain unchanged.
- [x] Define one shared force-eligibility function allowing only recognized document clients with confirmed scope and matching captured executable identity. Enforce it again at dispatch and at the exact handle boundary.
- [x] Persist `consent.json` with target library, exact preview identities and allowed/excluded targets before processing a force request. A write failure returns before native actions.
- [x] Keep excluded servers in the release result and require the existing independent release proof; process exit never means repaired/READY.
- [x] Run focused regressions and the complete suite with an isolated test mutex.
## Task 2: Version and operating contract
Files: `pyproject.toml`, `README.md`, `SOP.md`, `docs/ICDB-MANUAL-REPAIR-AND-UPDATE.md`, `docs/releases/v0.2.4-beta.1.md`.
- [x] Identify the actual tracked SOP before editing; update README, SOP and manual together.
- [x] Set `0.2.4b1` and document the user-confirmed client-only exception to the automatic no-force contract. Explain server handling, evidence, failure states, manual recovery and rollback.
- [x] Keep field ICDB recovery, Win10 and multiuser shared-library acceptance explicitly unverified.
## Task 3: Review branches
- [x] Inventory final files against main and assign each file to the smallest dependency-closed review stage. Keep UI/release hooks unavailable until their backend exists; do not publish branches with broken normal operation.
- [x] Create ordered branches with one concrete feature commit per review unit, no rewriting the existing umbrella history.
- [x] Test each review stage using appropriate unit/full checks; preserve all final regressions and verify the final source tree against the umbrella snapshot.
- [x] Push branches without force and create draft PRs with explicit base dependencies. Link them from #3 and record the splitting rationale.
## Task 4: Delivery
- [x] Commit and push the safety fixes and validation record to #3.
- [x] Verify remote heads, PR descriptions and clean review worktrees. Keep #3 and issues open and do not merge #5.
- [x] Prepare the final user report with PR links, passing tests and remaining field-acceptance limits.
## Delivery evidence
- Review chain: [#9](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/9) → [#10](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/10) → [#11](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/11) → [#12](https://git.simgreek.com/Skyworth_Digital_Hardware/cbb-refresh-verify-795/pulls/12). Each base/head was read back from the API and matched local branches; all remain Draft and open.
- #3 is the unmerged umbrella with the review chain linked. #5 was not merged; issues #2/#4 remain open.
- Complete suites: 491 / 1,376 / 1,545 / 1,601 passed for the four review stages; umbrella 1,601; focused release tests 43. Validation hashes and limits: `docs/releases/2026-11-05-pr249-review-validation.json`.
- Final implementation files match byte for byte; compile and diff checks pass. Only review worktrees were committed; the original running r10 test workspace was preserved.
- No new frozen package or field ICDB recovery acceptance is claimed. No actual Mentor client/server termination or production-library operation was performed.
@@ -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
- [ ] Reproduce BlockA releasing historical BlockB checkpoints and retained owners without naming BlockB in proof.
- [ ] 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.
- [ ] Run backend/lease regressions, compile/diff checks, commit on codex/review-native-backend.
## PR #11/#12
- [ ] Forward-merge backend into UI, then UI into residual branch; no history rewriting.
- [ ] Test one unreadable process/thread not affecting another, without fabricated modal windows; cover preview and action-time rechecks.
- [ ] Enumerate only target-process threads/windows, store incomplete-read metadata per PID. Keep unknown/active writers protected rather than adding a blind force override.
- [ ] Persist window identities and at most a 4 KiB output excerpt, preserve full preview in memory, stop duplicating activity output.
- [ ] Carry exact preview block scope into native Cancel and recheck identity/scope before clicking.
- [ ] Run residual/UI regressions, compile/diff checks, commit on residual branch.
## Chain tip
- [ ] Merge residual fixes into PR #13, preserving ca39fb3 and icon.
- [ ] Address #11's line-ending note once at the tip: application.py to LF; pin it and main_window.py in EditorConfig. Preserve all other file endings and the global * -text rule.
- [ ] Independent review, integrated full suite, compile/diff checks, validation records and fast-forward pushes to existing PR branches.
- [ ] Update PR descriptions with precise results and no new package/native acceptance. Leave #3 as historical umbrella, without merging or closing it.
@@ -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 -1
View File
@@ -3,7 +3,7 @@ requires = ["setuptools>=84.1.0"]
build-backend = "setuptools.build_meta"
[project]
name = "cbb-refresh-verify"
version = "0.2.4b1"
version = "0.2.3b1"
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
View File
@@ -1 +1 @@
__version__ = "0.2.4b1"
__version__ = "0.2.3b1"
+2 -26
View File
@@ -46,16 +46,6 @@ def resolve_data_root(cli_value: Path | None) -> Path:
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 main(argv: Sequence[str] | None = None) -> int:
parser = argparse.ArgumentParser(prog="CbbRefreshVerify")
parser.add_argument('--verify-worker', type=Path, help=argparse.SUPPRESS)
@@ -67,7 +57,6 @@ def main(argv: Sequence[str] | None = None) -> int:
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)
@@ -121,11 +110,6 @@ def main(argv: Sequence[str] | None = None) -> int:
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,
@@ -133,21 +117,13 @@ def main(argv: Sequence[str] | None = None) -> int:
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:
results = run_batch(requests)
except Exception:
retain_mapping('batch_exception')
lease.retain_for_recovery()
raise
if any(not result.safe_to_continue for result in results):
retain_mapping('native_release_unconfirmed')
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))
+9 -53
View File
@@ -29,55 +29,14 @@ def _paths(root):
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
directories = database_directories(library, project, pcb)
scope = (Path(project).parent, *directories)
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={pid}')
if match is None:
raise ValueError(f'TARGET_NATIVE_OWNER_UNCONFIRMED: 无法确认原生会话所属工程,PID={pid}')
from .mentor_adapter import pcb_processes, _process_details
from .icdb_ownership import unreleased_addresses
if pcb_processes() or any(_process_details(name) for name in (
'LibraryManager.exe', 'viewdraw.exe')):
raise ValueError('请先正常关闭 PCB、Library Manager 和原理图编辑器,再恢复备份。')
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=()):
"""Match complete native path arguments; a missing identity remains unknown."""
from .failed_session import _command_args
if not command:
return None
expected_files = {Path(path).resolve() for path in files}
expected_roots = tuple(Path(path).resolve() for path in roots)
identities = []
for arg in _command_args(command)[1:]:
value = arg.split('=', 1)[-1].strip('"')
path = Path(value)
if not path.is_absolute():
continue
key = arg.split('=', 1)[0].lstrip('-/').casefold() if '=' in arg else ''
if (path.suffix.casefold() in ('.prj', '.pcb', '.lmc')
or path.name.casefold() in ('database', '__reusableblockssymb', 'icdb.dat')
or key in ('project', 'icdb', 'database', 'db', 'lmc', 'prj', 'pcb')):
identities.append(path.resolve())
if not identities:
return None
return any(path in expected_files or any(path == root or path.is_relative_to(root)
for root in expected_roots) for path in identities)
raise ValueError(f'数据库会话尚未释放,停止恢复:{addresses}')
def _project_text(path):
@@ -181,12 +140,9 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
return report
def save(result):
record.update({'installed': installed, 'result': asdict(result)})
root.mkdir(parents=True, exist_ok=True)
report = root/'recovery-result.json'
try:
root.mkdir(parents=True, exist_ok=True)
report.write_text(json.dumps(record, ensure_ascii=False, default=str, indent=2), encoding='utf-8')
except OSError as error:
return replace(result, stderr=(result.stderr+'\n恢复报告写入失败:'+str(error)).strip())
report.write_text(json.dumps(record, ensure_ascii=False, default=str, indent=2), encoding='utf-8')
return replace(result, evidence_path=report)
from .com_runtime import initialize_com, uninitialize_com
initialized = initialize_com()
@@ -283,7 +239,7 @@ def recover_from_backup(request, source, *, progress=None, verifier=None, idle_c
return save(final)
except Exception as error:
return save(VerifyResult('FAIL' if installed else 'BLOCKED', stderr=str(error),
safe_to_continue=release_confirmed))
safe_to_continue=False))
finally:
try:
if library_lock is not None:
+9 -22
View File
@@ -48,7 +48,6 @@ class BatchStatusRecord:
detail: str = ""
fingerprint: str = ""
timestamp: str = ""
block_type: str = "RULP"
@property
def completed(self) -> bool:
@@ -107,11 +106,9 @@ 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'))
combined.update(b'\0')
combined.update(content_sha256.encode("ascii"))
combined.update(b"\0" + str(stat.st_size).encode("ascii"))
combined.update(b"\0" + str(stat.st_mtime_ns).encode("ascii") + b"\0")
@@ -168,7 +165,6 @@ class BatchCheckpoint:
detail=str(payload.get("detail") or ""),
fingerprint=str(payload.get("fingerprint") or ""),
timestamp=str(payload.get("timestamp") or ""),
block_type=str(payload.get("block_type") or "RULP"),
)
return cls(records)
@@ -186,12 +182,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 +192,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)
@@ -221,7 +212,7 @@ class BatchStatusSession:
for index, name in enumerate(names):
previous = checkpoint.get(name)
if (previous and previous.status in {'READY', 'PENDING'}
and previous.fingerprint == fingerprint.sha256 and previous.block_type == block_type):
and previous.fingerprint == fingerprint.sha256):
results.append(previous)
continue
try:
@@ -233,12 +224,11 @@ class BatchStatusSession:
block_name=name, status=result.status, source=result.source,
raw_status=result.raw_status, detail=result.detail,
fingerprint=fingerprint.sha256, timestamp=_now(),
block_type=block_type,
)
except BridgeUnavailable as error:
record = BatchStatusRecord(block_name=name, status="UNAVAILABLE",
detail=str(error), fingerprint=fingerprint.sha256,
timestamp=_now(), block_type=block_type)
timestamp=_now())
except BridgeResponseError as error:
message = str(error)
lower_message = message.casefold()
@@ -252,15 +242,15 @@ class BatchStatusSession:
else "UNAVAILABLE" if unavailable
else "MALFORMED" if malformed else "ERROR")
record = BatchStatusRecord(block_name=name, status=status, detail=message,
fingerprint=fingerprint.sha256, timestamp=_now(), block_type=block_type)
if server is not None and status != "UNAVAILABLE":
fingerprint=fingerprint.sha256, timestamp=_now())
if server is not None and status not in {"UNAVAILABLE", "MALFORMED"}:
try:
server.restart()
except BridgeUnavailable:
pass
except Exception as error: # bridge failures isolate one CBB
record = BatchStatusRecord(block_name=name, status="ERROR", detail=str(error),
fingerprint=fingerprint.sha256, timestamp=_now(), block_type=block_type)
fingerprint=fingerprint.sha256, timestamp=_now())
if server is not None:
try:
server.restart()
@@ -268,7 +258,7 @@ class BatchStatusSession:
pass
checkpoint.append(checkpoint_path, record)
results.append(record)
if record.status == "UNAVAILABLE" and index + 1 < len(names):
if record.status in {"UNAVAILABLE", "MALFORMED"} and index + 1 < len(names):
# Startup/protocol failures cannot be repaired by retrying
# the same request contract for every CBB.
# Preserve a terminal record for each remaining name so a
@@ -277,7 +267,6 @@ class BatchStatusSession:
unavailable_record = BatchStatusRecord(
block_name=remaining, status=record.status, detail=record.detail,
fingerprint=fingerprint.sha256, timestamp=_now(),
block_type=block_type,
)
checkpoint.append(checkpoint_path, unavailable_record)
results.append(unavailable_record)
@@ -296,8 +285,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``.
"""
-2
View File
@@ -1,5 +1,3 @@
"""Shared execution defaults for GUI, batch requests and integration."""
DEFAULT_TIMEOUT_SECONDS = 600
DIALOG_AGENT_STARTUP_TIMEOUT_SECONDS = 30
WORKER_START_GATE_TIMEOUT_SECONDS = DIALOG_AGENT_STARTUP_TIMEOUT_SECONDS + 15
+2 -9
View File
@@ -99,13 +99,7 @@ class DesktopWorker:
except Exception:
# Kill-through-job is a cleanup guarantee, not a launch requirement.
self.job_bound = False
except Exception as error:
# No worker means no native descendants; a partial launch is uncertain.
error.worker_launch_release = {
'process_created': self.handle is not None,
'safe_to_continue': self.handle is None,
'worker_exited': self.handle is None,
'remaining_pids': [self.pid] if self.handle is not None else []}
except Exception:
if self.handle is not None:
try:
win32process.TerminateProcess(self.handle, 1)
@@ -162,8 +156,7 @@ class DesktopWorker:
expected = {Path(__file__).with_name(name).resolve()
for name in ('save_verified_block.vbs', 'close_failed_block.vbs')}
clients = []
# Interpreter + COM startup measures ~4.75s on the field machine.
for row in query_owners(('cscript.exe',), timeout_seconds=10):
for row in query_owners(('cscript.exe',), timeout_seconds=3):
if row.get('parent') != self.pid:
continue
args = _command_args(row['command'])
-377
View File
@@ -1,377 +0,0 @@
"""Process-bound native opening check. This module never acquires PCB COM.
The caller must bind the newly launched PCB command/PID before entering here.
The check runs in that worker's private desktop and closes only that session.
"""
from __future__ import annotations
import ctypes
from ctypes import wintypes
import heapq
import hashlib
import ntpath
import os
from pathlib import Path
import re
import time
from .dialog_probe import _bounded_call
from .icdb_recovery import LOG_LIMIT, _read_log_delta, decode_log, snapshot_log
_MAX_WINDOWS = 128
_MAX_CHILDREN = 512
def _normal(path):
return ntpath.normcase(ntpath.normpath(str(path).strip()))
def _log_paths(job):
project = Path(job['project']).parent
pcb_logs = Path(job['pcb']).parent / 'LogFiles'
paths = [pcb_logs / 'PCBAutoSave.txt', pcb_logs / 'PCBLogFile.txt']
directory = project / 'database/cdbsvr/log'
directories = []
if directory.is_dir():
with os.scandir(directory) as entries:
directories = [entry.name for entry in entries if entry.is_dir(follow_symlinks=False)]
# Native names start with sortable YYYY-MM-DD HH.MM.SS. Only the
# newest candidates can describe this launch; history is never read.
for name in heapq.nlargest(8, directories):
with os.scandir(directory / name) as entries:
logs = heapq.nlargest(2, (entry.name for entry in entries
if entry.is_file(follow_symlinks=False) and entry.name.casefold().endswith('.txt')))
paths.extend(directory / name / log for log in logs)
return paths, directories
def _read_logs(job):
result = {}
paths, directories = _log_paths(job)
for path in paths:
try:
record = snapshot_log(path)
record['mtime_ns'] = path.stat().st_mtime_ns
result[str(path)] = record
except FileNotFoundError:
result[str(path)] = snapshot_log(path)
return {'files': result, 'server_directories': directories}
def _read_bounded(function):
try:
return _bounded_call(function, 2)
except TimeoutError as error:
# Abort this check, rather than spawning another reader while a slow
# share still owns the previous read. The daemon performs reads only.
raise RuntimeError('DIAGNOSTIC_LOG_READ_TIMEOUT: native evidence unavailable') from error
def snapshot_diagnostic_logs(job) -> dict:
"""Capture pre-launch content, so copied/stale successes cannot pass.
Store the returned JSON-compatible value at job['diagnostic_log_baseline'].
File count, content size and the entire read are bounded; failure is closed.
"""
started = time.time_ns()
return {'started_ns': started, **_read_bounded(lambda: _read_logs(job))}
def _fresh_logs_read(job, baseline):
paths, _ = _log_paths(job)
fresh = {}
for path in paths:
try:
stat = path.stat()
old = baseline['files'].get(str(path))
if stat.st_mtime_ns < baseline['started_ns']:
continue
if old is None:
if path.parent.name in baseline.get('server_directories', ()):
continue # An unobserved historical file cannot prove freshness.
old = {'size': 0, 'tail_sha256': hashlib.sha256(b'').hexdigest()}
if 'error' in old or (old.get('mtime_ns') == stat.st_mtime_ns and old['size'] == stat.st_size):
continue
content, appended = _read_log_delta(path, old)
if not content and stat.st_mtime_ns != old.get('mtime_ns') and stat.st_size == old['size']:
# Native PCBLog is overwritten with the same successful text.
content, _ = _read_log_delta(path, {'size': 0, 'tail_sha256': ''})
if not appended and old.get('truncated') and stat.st_size > LOG_LIMIT:
continue
fresh[str(path)] = decode_log(content)
except FileNotFoundError:
continue
return fresh
def _fresh_logs(job, baseline):
return _read_bounded(lambda: _fresh_logs_read(job, baseline))
def _load_evidence(job, pcb_pid, baseline, *, require_autosave=True):
logs = _fresh_logs(job, baseline)
project = Path(job['project']).parent
pcb = str(Path(job['pcb']))
auto_path = str(Path(job['pcb']).parent / 'LogFiles/PCBAutoSave.txt')
read_path = str(Path(job['pcb']).parent / 'LogFiles/PCBLogFile.txt')
names = re.findall(r'^Job Name:\s*(.*?)\s*$', logs.get(auto_path, ''), re.M | re.I)
if names and any(_normal(name) != _normal(pcb) for name in names):
return None
if require_autosave and not names:
return None
if 'Successfully read the design.' not in logs.get(read_path, ''):
return None
database = _normal(project / 'database')
project_file = _normal(job['project'])
for path, text in logs.items():
if path in (auto_path, read_path):
continue
db_paths = re.findall(r'S: Project path \[(.*?)\]', text)
prj_paths = re.findall(r'S: Project file \(\.prj\) path \[(.*?)\]', text)
startup = re.search(r'S: Started up automatically by iCDB Client: [^\r\n]*:' + str(pcb_pid) + r'\s*$', text, re.M)
client = re.search(r'Registered sub-client \[Expedition PCB[^\r\n]*process ID \[' + str(pcb_pid) + r'\]', text)
if (db_paths and all(_normal(value) == database for value in db_paths)
and prj_paths and all(_normal(value) == project_file for value in prj_paths)
and startup and client and 'S: iCDB database loaded' in text):
return {'pcb': pcb, 'pcb_pid': pcb_pid,
'logs': [auto_path, read_path, path], 'document_identity': 'native_path_pid_logs'}
return None
def _target_frame(windows, name):
matches = []
for window in windows:
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'}
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
def _windows(pid):
"""Read only this PID on the current desktop; cap text and enumeration work."""
import win32api
import win32gui
import win32process
user = ctypes.WinDLL('user32', use_last_error=True)
user.GetWindowTextW.argtypes = [wintypes.HWND, wintypes.LPWSTR, ctypes.c_int]
user.GetWindowTextW.restype = ctypes.c_int
deadline = time.monotonic() + .2
def text(hwnd):
if time.monotonic() >= deadline:
raise RuntimeError('DIAGNOSTIC_WINDOW_LIMIT: window scan exceeded 0.2s')
buffer = ctypes.create_unicode_buffer(4096)
# All handles belong to the external PCB PID: GetWindowText reads
# Windows' cached caption without sending a message to its UI thread.
# Custom controls may have no cached text; missing evidence fails closed.
user.GetWindowTextW(hwnd, buffer, len(buffer))
return buffer.value
result = []
seen = 0
def collect(hwnd, _):
nonlocal seen
if win32process.GetWindowThreadProcessId(hwnd)[1] != pid or not win32gui.IsWindowVisible(hwnd):
return True
seen += 1
if seen > _MAX_WINDOWS:
raise RuntimeError('DIAGNOSTIC_WINDOW_LIMIT: too many windows')
cls = win32gui.GetClassName(hwnd)
if cls.casefold() in {'uac_inputindicatoroverlaywnd', 'uac input indicator'}:
return True
children = []
count = 0
def child(ch, _):
nonlocal count
count += 1
if count > _MAX_CHILDREN:
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() == '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))})
return True
if cls == '#32770' or cls.casefold().startswith('afx:') or cls.casefold() == 'internet explorer_hidden':
win32gui.EnumChildWindows(hwnd, child, None)
caption = text(hwnd)
if cls.casefold() == 'internet explorer_hidden' and not caption and not children:
left, top, right, bottom = win32gui.GetWindowRect(hwnd)
if left == right and top == bottom:
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)})
return True
win32api.SetLastError(0)
try:
win32gui.EnumWindows(collect, None)
except Exception as error:
if getattr(error, 'winerror', None) not in (0, 2) or result:
raise
return result
class _NativeSession:
def __init__(self, job, pid, launcher):
if launcher is None or not callable(getattr(launcher, 'poll', None)):
raise RuntimeError('DIAGNOSTIC_LAUNCHER_REQUIRED: retain the exact launch process handle')
import win32api
import win32service
import win32con
import win32event
import win32gui
self.handles = []
self.pid = int(pid)
self.launcher = launcher
self.gui = win32gui
self.event = win32event
desktop = win32service.GetThreadDesktop(win32api.GetCurrentThreadId())
actual = win32service.GetUserObjectInformation(desktop, 2)
expected = str(job.get('desktop', '')).split('\\')[-1]
if not expected or expected.casefold() in {'default', 'winlogon', 'disconnect'} or actual.casefold() != expected.casefold():
raise RuntimeError('DIAGNOSTIC_DESKTOP_MISMATCH')
self.pcb = win32api.OpenProcess(win32con.SYNCHRONIZE, False, int(pid))
self.handles.append(self.pcb)
def pcb_alive(self):
return self.event.WaitForSingleObject(self.pcb, 0) != 0
def launcher_alive(self):
return self.launcher.poll() is None
def post(self, hwnd, message):
import win32process
if not self.pcb_alive() or win32process.GetWindowThreadProcessId(hwnd)[1] != self.pid:
raise RuntimeError('DIAGNOSTIC_STALE_WINDOW: target window identity changed')
self.gui.PostMessage(hwnd, message, 0, 0)
def close(self):
for handle in self.handles:
handle.Close()
self.handles.clear()
def _cancel(job):
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
raise RuntimeError('VERIFY_CANCELLED: native opening check cancelled')
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'}
if (window['class'].casefold().startswith('afx:') and not window.get('owner')
and (window['text'].casefold() in known_titles
or frame is not None and window['hwnd'] == frame['hwnd'])):
continue
text = ' '.join([window['text'], *(child['text'] for child in window['children'])]).casefold()
if not closing and ('select the desired product license' in text or window['text'] == 'Tip of the Day'):
return True # The caller's PID-scoped DialogAgent owns startup choices.
standard_save = (pcb_name and window['class'] == '#32770' and window['text'] == 'Expedition PCB'
and any(child['class'].casefold() == 'static'
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})
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 window['hwnd'] not in clicked:
session.post(targets[0]['hwnd'], 0xF5)
clicked.add(window['hwnd'])
continue
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: unknown native prompt preserved; '
f"pid={window['pid']} hwnd={window['hwnd']} class={window['class']!r} "
f"title={window['text']!r}")
return False
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.
PASS describes opening only; it does not imply refresh READY or unoccupied
shared library data. Unknown prompts are preserved for existing recovery.
"""
baseline = job.get('diagnostic_log_baseline')
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)
try:
deadline = time.monotonic() + max(.01, float(job['timeout']))
while True:
_cancel(job)
error = _read_bounded(error_reader) if error_reader else None
if error:
raise RuntimeError(str(error))
if not session.pcb_alive():
raise RuntimeError('DIAGNOSTIC_OPEN_UNCONFIRMED: target PCB exited before loaded evidence')
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)
# 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 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)
# Re-read the exact PID/frame before the sole close request.
_cancel(job)
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 current is None or current['hwnd'] != frame['hwnd']:
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: target frame changed')
session.post(frame['hwnd'], 0x10)
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 = _windows(int(pcb_pid)) if session.pcb_alive() else []
previous_clicks = set(clicked)
pending_error = None
try:
_pending_prompt(windows, closing=True, frame=frame, session=session, clicked=clicked,
pcb_name=Path(job['pcb']).name)
except RuntimeError as error:
if not str(error).startswith('DIAGNOSTIC_CLOSE_UNCONFIRMED: unknown native prompt'):
raise
# WM_CLOSE creates and destroys native windows asynchronously;
# preserve them and wait for populated controls or process exit.
pending_error = error
if str(error) != last_pending:
last_pending = str(error)
emit(stage='diagnostic_close_pending', detail=last_pending)
for hwnd in clicked - previous_clicks:
emit(stage='diagnostic_save_no', pcb_pid=int(pcb_pid), hwnd=hwnd)
if time.monotonic() >= close_deadline:
if pending_error is not None:
raise pending_error
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: target PCB/launcher still running')
time.sleep(.1)
# EE7.9 buffers PCBAutoSave's complete Job Name until normal close.
# The candidate permits closing only; PASS still needs that exact path.
evidence = _load_evidence(job, int(pcb_pid), baseline)
if evidence is None:
raise RuntimeError('DIAGNOSTIC_OPEN_UNCONFIRMED: fresh full PCB path not confirmed after close')
emit(stage='diagnostic_native_open_confirmed', **evidence)
return {'status': 'PASS', 'check': 'native_open_only', 'native_processes_exited': True,
'library_ownership': 'NOT_ASSESSED', 'pcb_pid': int(pcb_pid),
'launcher_pid': getattr(launcher_process, 'pid', None), 'evidence': evidence,
'detail': 'Native target opened and its PCB/launcher exited; refresh readiness and shared library ownership not assessed.'}
finally:
session.close()
+10 -39
View File
@@ -324,7 +324,6 @@ class DialogAgentServer:
self.channel = JsonChannel(connection)
self.channel.send({"token": paths.token}, timeout_seconds=10)
self.observed_snapshots = {}
self.observed_pids = None
@classmethod
def from_config(cls, config_path: Path, *, probe, executor=None):
@@ -349,15 +348,7 @@ class DialogAgentServer:
try:
phase = DialogPhase(request["phase"])
if request.get("op") == "observe":
pids = request.get('pids')
if pids is not None and (not isinstance(pids, list)
or any(type(pid) is not int or pid <= 0 for pid in pids)):
raise ValueError('DIALOG_PID_SCOPE_INVALID')
self.observed_pids = set(pids) if pids is not None else None
snapshots = (self.probe.capture(phase, pids=self.observed_pids) if pids is not None
else self.probe.capture(phase))
if pids is not None:
snapshots = tuple(w for w in snapshots if w.pid in self.observed_pids)
snapshots = self.probe.capture(phase)
self.observed_snapshots.clear()
for snapshot in snapshots:
self.observed_snapshots[stable_fingerprint(snapshot)] = snapshot
@@ -365,9 +356,7 @@ class DialogAgentServer:
return
if request.get("op") == "perform":
expected = self.observed_snapshots.get(request.get("fingerprint"))
if (expected is None or int(request.get('hwnd', 0)) != expected.hwnd
or self.observed_pids is not None and (expected.pid not in self.observed_pids
or not self.probe.matches_identity(expected))):
if expected is None:
self._response(request, result=ActionResult(
error_code="STALE_DIALOG",
detail="窗口已消失或指纹已变化",
@@ -433,45 +422,27 @@ class DialogAgentClient:
raise
@classmethod
def start(cls, worker, root: Path, *, timeout_seconds: float = 2.0, stop=None):
def start(cls, worker, root: Path, *, timeout_seconds: float = 2.0):
client = cls.prepare(root, desktop_name=worker.name, timeout_seconds=timeout_seconds)
try:
from .defaults import DIALOG_AGENT_STARTUP_TIMEOUT_SECONDS
worker.start_companion(dialog_agent_command(client.paths.config))
# Frozen imports can exceed ten seconds; PCB remains behind its gate.
client._accept(timeout_seconds=DIALOG_AGENT_STARTUP_TIMEOUT_SECONDS, stop=stop)
client._accept(timeout_seconds=10.0)
return client
except Exception:
client.close()
raise
def _accept(self, timeout_seconds, *, stop=None):
def _accept(self, timeout_seconds):
if self.channel is not None:
return
deadline = time.monotonic() + timeout_seconds
while True:
if stop is not None and stop.is_set():
raise InterruptedError('VERIFY_CANCELLED: 弹窗代理启动已取消,未启动 PCB')
remaining = deadline - time.monotonic()
if remaining <= 0:
raise TimeoutError('dialog-agent startup timed out')
self.listener.settimeout(min(.2, remaining))
try:
connection, _address = self.listener.accept()
break
except socket.timeout:
continue
self.listener.settimeout(timeout_seconds)
connection, _address = self.listener.accept()
channel = JsonChannel(connection)
try:
connection.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
remaining = deadline - time.monotonic()
if remaining <= 0:
raise TimeoutError('dialog-agent handshake timed out')
hello = channel.receive(min(self.timeout_seconds, remaining))
hello = channel.receive(timeout_seconds)
if hello.get("token") != self.paths.token:
raise DialogAgentProtocolError("dialog-agent authentication failed")
if stop is not None and stop.is_set():
raise InterruptedError('VERIFY_CANCELLED: 弹窗代理启动已取消,未启动 PCB')
self.channel = channel
except Exception:
channel.close()
@@ -502,8 +473,8 @@ class DialogAgentClient:
raise DialogAgentProtocolError(f"{response['error_code']}: {response.get('detail', '')}")
return response.get("result")
def observe(self, phase: DialogPhase, *, pids=None) -> tuple[WindowSnapshot, ...]:
result = self._request("observe", phase, **({'pids': sorted(pids)} if pids is not None else {}))
def observe(self, phase: DialogPhase) -> tuple[WindowSnapshot, ...]:
result = self._request("observe", phase)
return tuple(WindowSnapshot.from_record(item) for item in (result or ()))
def perform(self, *, hwnd: int, fingerprint: str, action: dict,
+1 -15
View File
@@ -265,23 +265,9 @@ class WindowProbe:
except Exception:
return None
def matches_identity(self, snapshot):
try:
return (self.win32gui.IsWindowVisible(snapshot.hwnd)
and self.win32process.GetWindowThreadProcessId(snapshot.hwnd)[1] == snapshot.pid
and self.win32gui.GetClassName(snapshot.hwnd) == snapshot.window_class)
except Exception:
return False
def capture(self, phase: DialogPhase, *, pids=None) -> tuple[WindowSnapshot, ...]:
def capture(self, phase: DialogPhase) -> tuple[WindowSnapshot, ...]:
snapshots = []
for hwnd in self._handles():
if pids is not None:
try:
if self.win32process.GetWindowThreadProcessId(hwnd)[1] not in pids:
continue
except Exception:
continue
try:
window_class = str(self.win32gui.GetClassName(hwnd) or "")
except Exception:
+2 -6
View File
@@ -100,15 +100,11 @@ class DialogBackend(Protocol):
class AgentDialogBackend:
"""Adapt the private-desktop JSONL client to the supervisor backend."""
def __init__(self, client, *, pids=None) -> None:
def __init__(self, client) -> None:
self.client = client
self.pids = pids
def observe(self, phase: DialogPhase):
if self.pids is None:
return self.client.observe(phase)
pids = set(self.pids())
return tuple(w for w in self.client.observe(phase, pids=pids) if w.pid in pids)
return self.client.observe(phase)
def perform(self, snapshot: WindowSnapshot, action: dict, phase: DialogPhase) -> ActionResult:
return self.client.perform(
+22 -63
View File
@@ -24,42 +24,13 @@ def _command_args(command):
kernel.LocalFree(ctypes.cast(args, wintypes.HLOCAL))
def _startup_snapshot(hwnd, pcb_pid):
import win32gui, win32process
from .dialog_models import ControlSnapshot, DialogPhase, WindowSnapshot
if win32process.GetWindowThreadProcessId(hwnd)[1] != pcb_pid:
raise ValueError('STARTUP_WINDOW_OWNER_CHANGED')
children = []
win32gui.EnumChildWindows(hwnd, lambda child, _: children.append(child), None)
controls = tuple(ControlSnapshot(child, win32gui.GetDlgCtrlID(child) & 0xffff,
win32gui.GetClassName(child), win32gui.GetWindowText(child),
enabled=bool(win32gui.IsWindowEnabled(child))) for child in children)
return WindowSnapshot(hwnd, pcb_pid, 'ExpeditionPCB.exe', 'pcb',
win32gui.GetClassName(hwnd), win32gui.GetWindowText(hwnd), DialogPhase.PCB_STARTING, controls)
def _cancel_target(snapshot):
from .post_repair_consent import exact_prompt
from .dialog_rules import pcb_version_choice
if exact_prompt(snapshot):
return 'read_write_access', next(c for c in snapshot.controls if c.control_id == 7)
if pcb_version_choice(snapshot) is not None:
buttons = [c for c in snapshot.controls if c.class_name == 'Button']
cancel = [c for c in buttons if c.control_id == 2 and c.name == 'Cancel' and c.enabled]
if (len(cancel) == 1 and {c.control_id for c in buttons} == {6212, 6213, 6206, 1, 2}
and any(c.control_id == 6211 and c.name == '* Cancelling will load no design.'
for c in snapshot.controls)):
return 'pcb_version_choice', cancel[0]
return None
def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event: 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.
No COM attach: there is no document, and the global ROT can name another
session. Unknown windows, live database addresses and other desktops are
retained. WM_CLOSE is cooperative; no save prompt is accepted or killed.
"""
import win32api, win32con, win32gui, win32process
from .mentor_adapter import _process_details
@@ -72,6 +43,23 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
if launcher_process is not None:
result['launcher_pid'] = launcher_process.pid
try:
diagnosed = False
diagnosis_path = root/'diagnostics/icdb-recovery.json'
if diagnosis_path.is_file():
diagnosis = json.loads(diagnosis_path.read_text('utf-8'))
diagnosed = diagnosis.get('error_code') == 'ICDB_REPAIR_REQUIRED'
dialogs_path = root/'dialogs.jsonl'
if not diagnosed and dialogs_path.is_file():
for line in dialogs_path.read_text('utf-8').splitlines():
try:
dialog = json.loads(line)
except ValueError:
continue
if (dialog.get('pid') == pcb_pid and dialog.get('phase') == 'PCB_STARTING'
and dialog.get('error_code') == 'MENTOR_DATABASE_LOAD_FAILED'):
diagnosed = True
if not diagnosed:
raise ValueError('STARTUP_FAILURE_UNCONFIRMED')
desktop = job.get('desktop', '')
if (job.get('interactive_input') or not desktop.startswith('CbbVerify_')
or _current_desktop_name() != desktop):
@@ -81,20 +69,14 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
expected = os.path.normcase(os.path.abspath(job['pcb']))
deadline = time.monotonic() + max(0, timeout_seconds)
sent = False
declined_hwnd = None
declined_kind = None
cancelled_open = False
while True:
records = [r for r in _process_details('ExpeditionPCB.exe') if r[0] == pcb_pid]
if not records:
if declined_hwnd is not None:
cancelled_open = True
result['cancelled_prompt'] = declined_kind
addresses = unreleased_addresses(job['lmc_file'], job['project'], job['pcb'])
launcher_exited = launcher_process is None or launcher_process.poll() is not None
result['release'] = {'pcb_exited': True, 'launcher_exited': launcher_exited,
'addresses': addresses,
'safe_to_continue': launcher_exited and (cancelled_open or not addresses)}
'safe_to_continue': launcher_exited and not addresses}
if result['release']['safe_to_continue']:
result['status'] = 'CLOSED'
result.pop('detail', None)
@@ -118,29 +100,6 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
windows.append(hwnd)
win32api.SetLastError(0)
win32gui.EnumWindows(observe, None)
if declined_hwnd is not None and declined_hwnd not in windows:
cancelled_open = True
result['cancelled_prompt'] = declined_kind
if declined_hwnd is None:
for hwnd in windows:
if win32gui.GetClassName(hwnd) != '#32770':
continue
snapshot = _startup_snapshot(hwnd, pcb_pid)
target = _cancel_target(snapshot)
if target is None:
continue
# Re-read immediately before declining; never select a version.
current = _startup_snapshot(hwnd, pcb_pid)
if _cancel_target(current) != target or current != snapshot:
raise ValueError('STARTUP_CANCEL_PROMPT_CHANGED')
declined_kind, cancel = target
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)
break
if declined_hwnd is not None:
continue
main = [w for w in windows if win32gui.GetClassName(w).startswith('Afx:')
and win32gui.GetWindowText(w).strip() in (
'Expedition PCB', 'Expedition PCB - Reusable Block')
@@ -172,7 +131,7 @@ def close_failed_startup(job, pcb_pid, *, baseline_pids=(), emit=lambda **event:
win32api.SetLastError(0)
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 len(main) == 1 and not unknown and not documents and not addresses:
win32gui.PostMessage(main[0], win32con.WM_CLOSE, 0, 0)
sent = True
emit(stage='startup_close_requested', pcb_pid=pcb_pid, hwnd=main[0])
+1 -1
View File
@@ -21,7 +21,7 @@ def maintenance_counts(results):
'checked_without_repair': sum(r.status == 'CHECKED' for r in results),
'issues_found': sum(r.error_category == 'ICDB_REPAIR_REQUIRED' for r in results),
'in_use': sum(r.error_category == 'ICDB_DATABASE_IN_USE' for r in results),
'unconfirmed': sum(r.status not in ('PASS', 'CHECKED', 'SKIPPED', 'CANCELLED')
'unconfirmed': sum(r.status not in ('CHECKED', 'SKIPPED', 'CANCELLED')
and r.error_category not in ('ICDB_REPAIR_REQUIRED', 'ICDB_DATABASE_IN_USE') for r in results),
'cancelled': sum(r.status == 'CANCELLED' for r in results),
'skipped': sum(r.status == 'SKIPPED' for r in results),
+1 -33
View File
@@ -17,37 +17,6 @@ _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)
_ICDB_MESSAGE = re.compile(r'(?<![A-Za-z0-9_])icdb(?![A-Za-z0-9_.\\/])', re.I)
_FAILURE_MESSAGE = re.compile(
r'\b(?:error|failed|failure|unable|cannot|could\s+not|lost|corrupt(?:ed|ion)?|'
r'inconsistent|unsupported|refused|denied)\b|失败|错误|异常|无法|损坏|失联|拒绝|未完成', re.I)
def _icdb_error_paragraphs(text, *, error_message=False):
text = str(text or '').replace('\r', '')
for record in _session_losses(text):
yield record['native_message'].strip()
for paragraph in text.splitlines():
# A pathname or our own category label is not native error content.
message = re.sub(r'\[[^\]\n]*[\\/][^\]\n]*\]', '', paragraph)
if _ICDB_MESSAGE.search(message) and (error_message or _FAILURE_MESSAGE.search(message)):
yield paragraph.strip()
def icdb_error_content(text, *, error_message=False):
"""Extract failure paragraphs mentioning iCDB; codes/healthy text do not qualify."""
return '\n\n'.join(dict.fromkeys(_icdb_error_paragraphs(text, error_message=error_message)))
def read_icdb_error(path, baseline):
"""Retain only new native error content, with the same bounded freshness rules."""
data, appended = _read_log_delta(path, baseline)
if not appended and (not baseline or baseline.get('truncated') or 'icdb_errors' not in baseline):
return ''
previous = baseline.get('icdb_errors', [])
return '\n\n'.join(message for message in _icdb_error_paragraphs(decode_log(data))
if appended or ' '.join(message.split()) not in previous)
def parse_session_loss(text):
"""Keep the native target verbatim; never infer a local repair target."""
@@ -99,10 +68,9 @@ def snapshot_log(path):
losses = [_session_identity(record) for record in _session_losses(decode_log(tail))]
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}
except FileNotFoundError:
return {'size': 0, 'tail_sha256': hashlib.sha256(b'').hexdigest(), 'icdb_errors': []}
return {'size': 0, 'tail_sha256': hashlib.sha256(b'').hexdigest()}
except OSError as error:
return {'error': str(error)}
+33 -201
View File
@@ -17,16 +17,6 @@ class LibraryBusy(OSError):
pass
def inspect_residual_sessions(library, *, block_names=()):
from .residual_sessions import inspect_residual_sessions as inspect
return inspect(library, block_names=block_names)
def release_residual_sessions(plan, evidence_dir, *, stop=None, force=False):
from .residual_sessions import release_residual_sessions as release
return release(plan, evidence_dir, stop=stop, force=force)
def _key(path):
return str(Path(path).resolve()).casefold()
@@ -63,70 +53,32 @@ def checkpoint_record(path):
def has_blocker(library):
path = blocker_path(library)
if path.with_suffix('.pending').exists():
return True
if not path.exists():
return False
record = checkpoint_record(path)
# Complete snapshots retain every file, including their source lease
# checkpoint. Only a valid relocated snapshot record can be ignored.
for marker in (path, path.with_suffix('.pending')):
if marker.exists():
record = checkpoint_record(marker)
if record is None or _key(record['library']) == _key(library):
return True
return False
return record is None or _key(record['library']) == _key(library)
def has_retained_library(library):
"""Include leases retained without a JSON checkpoint, such as PCB checks."""
path = Path(library).resolve()
key = _key(path.with_name('.' + path.stem + '.cbb-upload.lock'))
with _guard:
owner = _owners.get(key)
return bool(owner and owner['retained'])
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 or has_blocker(library) or has_retained_library(library)):
return None
def notify(stage, **details):
if progress is not None:
try:
progress({'stage': stage, 'block': block_name or '', **details})
except Exception:
import logging
logging.getLogger(__name__).warning('Release progress observer failed', exc_info=True)
notify('previous_release_check', detail='正在复核历史记录对应的实际占用')
try:
proof = release_retained_library(library, evidence_dir, block_name=block_name)
except Exception as error:
notify('previous_release_unconfirmed', detail=str(error))
raise
notify('previous_release_confirmed', release_proof=proof,
detail='已确认会话释放并归档历史记录;这不表示历史数据已恢复')
return proof
def _persist_blocker(library, status='OWNER_RELEASE_UNCONFIRMED', *, lease_id, block_name=None):
import win32api, win32process
def _persist_blocker(library, status='OWNER_RELEASE_UNCONFIRMED', *, lease_id):
path = blocker_path(library)
pending = path.with_suffix('.pending')
previous = checkpoint_record(path)
export_record = ({'export_analysis': previous['export_analysis']}
if previous and previous['lease_id'] == lease_id and 'export_analysis' in previous else {})
if block_name is not None:
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']
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,
'machine': socket.gethostname(),
'supervisor_created': win32process.GetProcessTimes(win32api.GetCurrentProcess())['CreationTime'].isoformat(),
'pid': os.getpid(), 'time': datetime.now(timezone.utc).isoformat()}, stream)
stream.flush(); os.fsync(stream.fileno())
pending.replace(path)
class LibraryLock:
def __init__(self, library, *, safe_to_release=None, checkpoint=True, block_name=None):
def __init__(self, library, *, safe_to_release=None, checkpoint=True):
library = Path(library).resolve()
self.library = library
self.path = library.with_name('.' + library.stem + '.cbb-upload.lock')
@@ -134,7 +86,6 @@ class LibraryLock:
self.entered = False
self.safe_to_release = safe_to_release
self.checkpoint = checkpoint
self.block_name = block_name
self.maintenance_guard = None
self.maintenance_mutex = None
@@ -154,13 +105,6 @@ class LibraryLock:
except Exception:
released = False
if released:
if owner.get('checkpoint', True):
marker = blocker_path(self.library)
record = checkpoint_record(marker)
if (record is None or record['lease_id'] != owner['lease_id']
or 'export_analysis' in record or marker.with_suffix('.pending').exists()):
raise LibraryBusy('协调检查点身份或导出会话尚未确认,保持库锁。')
marker.unlink()
owner['handle'].Close()
del _owners[self.key]
owner = None
@@ -182,8 +126,6 @@ class LibraryLock:
win32con.GENERIC_READ | win32con.GENERIC_WRITE, 0, None,
win32con.OPEN_ALWAYS, win32con.FILE_ATTRIBUTE_NORMAL, None)
except Exception as error:
if getattr(error, 'winerror', None) not in (32, 33):
raise
raise LibraryBusy(f'中心库已锁定或无法创建协调锁:{self.path}: {error}') from error
try:
data = (f'machine={socket.gethostname()}; pid={os.getpid()}; '
@@ -198,16 +140,14 @@ class LibraryLock:
import pywintypes
win32file.SetFileTime(handle, None, None, pywintypes.Time(datetime.now()))
if self.checkpoint:
_persist_blocker(self.library, 'OPERATION_IN_PROGRESS', lease_id=lease_id,
block_name=self.block_name)
_persist_blocker(self.library, 'OPERATION_IN_PROGRESS', lease_id=lease_id)
except Exception:
handle.Close()
raise
_owners[self.key] = {'thread': threading.get_ident(), 'depth': 1,
'handle': handle, 'retained': False, 'lease_id': lease_id,
'checkpoint': self.checkpoint,
'block_name': self.block_name,
'release_probe': self.safe_to_release}
'release_probe': self.safe_to_release if not self.checkpoint else None}
self.entered = True
return self
@@ -301,67 +241,6 @@ def _supervisor_alive(pid):
handle.Close()
def _recorded_supervisor_alive(record):
"""None means legacy/unknown identity; the native/file guard still applies."""
if record.get('machine') != socket.gethostname() or not record.get('supervisor_created'):
return None
import pywintypes, win32api, win32con, win32process
try:
handle = win32api.OpenProcess(win32con.SYNCHRONIZE | 0x1000, False, record['pid'])
except pywintypes.error as error:
return False if error.winerror == 87 else None
try:
return (win32process.GetProcessTimes(handle)['CreationTime'].isoformat() == record['supervisor_created']
and _supervisor_alive(record['pid']))
finally:
handle.Close()
def _owner_matches_scope(item, library, roots):
"""False requires an explicit other project; a missing path stays unknown."""
import ntpath
from .failed_session import _command_args
command = str(item.get('command') or '')
if not command:
return None
try:
args = _command_args(command)
except (OSError, ValueError):
return None
candidates = []
worker_flags = {'--verify-worker', '--repair-worker', '--management-worker', '--native-backup-worker'}
for index, arg in enumerate(args[1:], 1):
if arg.casefold() in worker_flags and index + 1 < len(args):
try:
request = Path(args[index + 1])
if request.stat().st_size > 1024 * 1024:
return None
record = json.loads(request.read_text(encoding='utf-8'))
for key in ('library', 'lmc_file', 'project', 'database'):
if isinstance(record.get(key), str):
candidates.append(record[key])
except (OSError, ValueError, TypeError, AttributeError):
return None
value = arg.split('=', 1)[1] if arg.startswith('-') and '=' in arg else arg
if (ntpath.isabs(value) and (ntpath.splitext(value)[1].casefold() in ('.prj', '.pcb', '.lmc')
or arg.casefold().startswith(('-project=', '-icdb='))
or args[index - 1].casefold() in ('-icdb', '-project', '-p'))):
candidates.append(value)
normalized_roots = [ntpath.normcase(ntpath.normpath(str(root))) for root in roots]
expected_library = ntpath.normcase(ntpath.normpath(str(library)))
for candidate in candidates:
path = ntpath.normcase(ntpath.normpath(candidate))
if path == expected_library:
return True
for root in normalized_roots:
try:
if ntpath.commonpath((path, root)) == root:
return True
except ValueError:
pass
return False if candidates else None
def _enter_maintenance(lease):
"""Transfer only a valid known lease, after project admission under lock."""
import win32con, win32event, win32file
@@ -387,16 +266,13 @@ def _enter_maintenance(lease):
raise LibraryBusy('本进程库锁仍在使用或检查点身份不符')
handle = existing['handle']
else:
if record is not None and record['pid'] != os.getpid() and _recorded_supervisor_alive(record) is True:
if record is not None and record['pid'] != os.getpid() and _supervisor_alive(record['pid']):
raise LibraryBusy('原监督进程仍存在,不能接续其库锁')
handle = win32file.CreateFile(str(lease.path), win32con.GENERIC_READ | win32con.GENERIC_WRITE,
0, None, win32con.OPEN_ALWAYS, win32con.FILE_ATTRIBUTE_NORMAL, None)
# All target/process/address/exclusive-file checks finish BEFORE
# any old checkpoint replacement. Keep the exact sidecar open.
from .native_export_guard import prove_export_copies_released
if record is not None and _recorded_supervisor_alive(record) is None:
from .maintenance_entry import assert_native_idle
assert_native_idle()
with prove_export_copies_released(lease.library), lease.maintenance_guard() as proof:
if (marker.read_bytes() if marker.exists() else None) != old:
raise LibraryBusy('维护检查期间检查点变化')
@@ -409,8 +285,7 @@ def _enter_maintenance(lease):
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,
'retained': False, 'lease_id': lease_id, 'checkpoint': True,
'release_probe': lease.safe_to_release, 'block_name': None}
'retained': False, 'lease_id': lease_id}
lease.maintenance_proof = proof
lease.entered = True
lease.maintenance_mutex = mutex
@@ -440,20 +315,16 @@ def owned_snapshot(path):
@contextmanager
def _prove_library_released(library, block_name=None, *, allow_unknown_checkpoint=False):
def _prove_library_released(library, block_name=None):
"""Hold all native database read handles during explicit lease release."""
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 (allow_unknown_checkpoint
or not getattr(worker, 'cbb_library', None) or _key(worker.cbb_library) == _key(library))
for worker in _retained_workers):
assert_retained_exports_idle()
if any(worker.poll() is None for worker in _retained_workers):
raise LibraryBusy('原生管理工作进程尚未返回,不能解除协调阻止。')
from .com_runtime import initialize_com, uninitialize_com
initialized = initialize_com()
@@ -463,65 +334,50 @@ def _prove_library_released(library, block_name=None, *, allow_unknown_checkpoin
'cscript.exe', 'wscript.exe', 'python.exe', 'pythonw.exe',
'CbbRefreshVerify.exe', *sorted(_OWNER_NAMES))
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_root is not None:
raise LibraryBusy('未知检查点必须执行完整库释放证明。')
def check_owners():
owners = []
for item in query_owners(names):
if item['pid'] == os.getpid():
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:
if scope_root is not None and item.get('command'):
command = str(item['command']).casefold().replace('/', '\\')
if str(scope_root).casefold().replace('/', '\\') not in command:
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 (
'--verify-worker', '--repair-worker', '--management-worker', '--native-backup-worker')):
'--verify-worker', '--repair-worker', '--management-worker')):
owners.append(item)
if owners:
raise LibraryBusy(f'原生进程仍存在,不能解除协调阻止:{owners}')
return owners
check_owners()
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))
entries = scan_tree(Path(library).parent)
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))]
and (scope_root is None or path.resolve().is_relative_to(scope_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
native = [path for path in entries if path.is_file() and (
path.suffix.casefold() == '.lmc'
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:
and (scope_root is None or path.resolve().is_relative_to(scope_root))))]
if Path(library).resolve() not in native:
raise LibraryBusy('目标库身份缺失,不能解除协调阻止。')
with ExitStack() as stack:
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)
export_copies = stack.enter_context(prove_export_copies_released(library))
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 {'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):
"""Reconcile historical leases after fresh owner/address/access proof.
"""Explicit user-requested release, 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.
@@ -549,41 +405,17 @@ def release_retained_library(library, evidence_dir, *, block_name=None):
win32con.GENERIC_READ | win32con.GENERIC_WRITE, 0, None,
win32con.OPEN_ALWAYS, win32con.FILE_ATTRIBUTE_NORMAL, None)
except Exception as error:
if getattr(error, 'winerror', None) not in (32, 33):
raise
raise LibraryBusy('其他进程仍持有库锁,不能解除。') from error
marker = blocker_path(library)
checkpoints = (marker, marker.with_suffix('.pending'))
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 = (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)
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})
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))
proof_context = (_prove_library_released(library, block_name=block_name)
if block_name else _prove_library_released(library))
with proof_context as proof:
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('释放检查期间协调检查点变化,保留原文件。')
marker = blocker_path(library)
checkpoints = (marker, marker.with_suffix('.pending'))
if any(path.exists() and checkpoint_record(path) is None for path in checkpoints):
raise LibraryBusy('协调检查点格式不明或已损坏,保留原文件供人工审查。')
root = evidence/('release-' + uuid4().hex)
root.mkdir(parents=True, exist_ok=False)
record = {'library': str(library), 'status': 'RELEASE_CONFIRMED', **proof,
'requested_block_name': block_name, 'proof_scope': 'BLOCK' if scoped else 'LIBRARY',
'proof_block_name': scoped, 'reconciled_checkpoints': reconciled,
'reconciled_foreign_blockers': foreign,
'unknown_checkpoint_archived': unknown,
'data_recovery_confirmed': False, 'evidence_path': str(root/'release.json')}
(root/'release.json').write_text(json.dumps(record, ensure_ascii=False, indent=2), encoding='utf-8')
for index, checkpoint in enumerate(checkpoints):
+67 -64
View File
@@ -15,29 +15,12 @@ from uuid import uuid4
def assert_native_idle(target=None):
from .owner_probe import query_owners
from .failed_session import _command_args
from .native_management import _retained_workers
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 = None
roots = ()
if target is not None:
from .backup_recovery import _project_text
roots = (Path(target.project).parent, Path(target.database))
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):
assert_retained_exports_idle()
if any(worker.poll() is None for worker in _retained_workers):
raise ValueError('MAINTENANCE_OWNER_ACTIVE: 管理工作进程尚未返回')
names = ('ExpeditionPCB.exe', 'LibraryManager.exe', 'viewdraw.exe', 'iCDBProjectBackup.exe',
'ReuseBlockImporter.exe', 'CleanWGLib.exe', 'cscript.exe', 'wscript.exe',
@@ -49,10 +32,18 @@ def assert_native_idle(target=None):
name, command = item['name'].casefold(), item['command'].casefold()
automation = name in ('python.exe', 'pythonw.exe', 'cbbrefreshverify.exe')
if not automation or not command or any(flag in command for flag in (
'--verify-worker', '--repair-worker', '--management-worker', '--native-backup-worker')):
'--verify-worker', '--repair-worker', '--management-worker')):
owners.append(item)
if target is not None:
owners = [item for item in owners if _owner_matches_scope(item, library, roots) is not False]
expected = os.path.normcase(os.path.abspath(str(target.project)))
scoped = []
for item in owners:
command = str(item.get('command') or '')
if not command:
scoped.append(item)
elif expected in [os.path.normcase(os.path.abspath(arg)) for arg in _command_args(command)[1:]]:
scoped.append(item)
owners = scoped
if owners:
raise ValueError(f'MAINTENANCE_OWNER_ACTIVE: 请正常关闭原生程序/操作助手:{owners}')
@@ -224,9 +215,13 @@ def maintenance_target_guard(request, expected=None, *, stop=None):
def run_icdb_check(request, *, progress=None, stop=None):
"""Open PCB diagnostically and classify this attempt's native error content."""
from .verify_runner import VerifyResult, run_verify
from .icdb_recovery import icdb_error_content
"""Inspect through Project Backup; never launch PCB, Repair or Restore."""
from .verify_runner import VerifyResult
from .library_lock import LibraryLock, LibraryBusy
from .native_repair import run_native_repair, RepairTarget
from .native_backup import native_backup_project
from .backup_recovery import _project_text
from .native_occupancy import confirmed_inspection
root = Path(request.evidence_dir).resolve()/('icdb-check-'+uuid4().hex[:12])
library_root = Path(request.lmc_file).resolve().parent
if root.is_relative_to(library_root) or library_root.is_relative_to(root):
@@ -234,7 +229,10 @@ def run_icdb_check(request, *, progress=None, stop=None):
stderr='检查记录目录需位于中心库之外。')
record = {'operation': 'icdb_batch_check', 'automatic_repair': False,
'library': str(request.lmc_file), 'block': request.block_name}
started = False
released = True
def check():
if stop is not None and stop.is_set():
raise InterruptedError('已取消检查。')
def save(result):
report = root/'result.json'
recorded = replace(result, evidence_path=report)
@@ -247,46 +245,51 @@ def run_icdb_check(request, *, progress=None, stop=None):
return result
return recorded
try:
check()
root.mkdir(parents=True, exist_ok=False)
if stop is not None and stop.is_set():
return save(VerifyResult('CANCELLED', stderr='已取消 ICDB 检查。'))
if progress:
progress({'stage': 'icdb_startup_check', 'block': request.block_name,
'detail': '正在打开工程并检查本次错误信息'})
started = True
startup = run_verify(replace(request, maintenance=False, auto_repair=False,
diagnostic_only=True, native_lm_verify=False, post_repair_proof=None,
evidence_dir=root/'pcb-open'), progress=progress, stop=stop)
record['native_open'] = asdict(startup)
if startup.status == 'CANCELLED' or stop is not None and stop.is_set():
return save(replace(startup, status='CANCELLED', recovery_attempts=()))
if startup.status == 'PASS' and startup.safe_to_continue:
return save(replace(startup, status='CHECKED', library_flag='UNKNOWN',
stdout='工程打开正常,未发现 ICDB 错误;未执行 CBB 校验。', recovery_attempts=()))
content = icdb_error_content(startup.stderr, error_message=True)
if (startup.evidence_path
and startup.evidence_path.resolve().is_relative_to(root/'pcb-open')):
try:
saved = json.loads(startup.evidence_path.with_name('diagnostics').joinpath(
'icdb-error-content.json').read_text('utf-8'))
native = icdb_error_content(saved.get('native_message', ''))
if native:
content = '\n'.join(dict.fromkeys(filter(None, (content, native))))
record['native_error'] = saved
except (OSError, ValueError, AttributeError):
pass
if content:
return save(replace(startup, status='FAIL', library_flag='UNKNOWN',
error_category='ICDB_REPAIR_REQUIRED',
stderr='发现 ICDB 错误,未执行修复。\n'+content, recovery_attempts=()))
category = startup.error_category
if not category or category.startswith('ICDB_'):
category = 'ICDB_INSPECTION_UNCONFIRMED'
return save(replace(startup, status='FAIL' if startup.status=='PASS' else startup.status,
error_category=category, library_flag='UNKNOWN', recovery_attempts=(),
stderr=startup.stderr or '工程打开或释放未完成,尚无法确认 ICDB 状态。'))
with LibraryLock(request.lmc_file, checkpoint=False, safe_to_release=lambda: released):
project = native_backup_project(request.lmc_file, request.block_name)
values = re.findall(r'^KEY iCDBDir "([^"\r\n]*)"', _project_text(project), re.M)
if (len(values) != 1 or not values[0] or PureWindowsPath(values[0]).drive
or PureWindowsPath(values[0]).root
or (project.parent/values[0]).resolve() != (project.parent/'database').resolve()):
raise ValueError('无法确认工程的 ICDB 数据库路径。')
target = RepairTarget(project, project.parent/'database')
record['target'] = asdict(target)
check()
if progress:
progress({'stage': 'icdb_ownership_check', 'block': request.block_name,
'detail': '正在检查 ICDB 状态'})
released = False
inspection = run_native_repair(target, root/'native-inspection',
mentor_bin=request.mentor_bin, timeout_seconds=min(30, request.timeout_seconds),
progress=progress, inspection_only=True, stop=stop)
record['native_inspection'] = inspection
released = (inspection.get('release', {}).get('native_exited') is True
or inspection.get('native_started') is False
and inspection.get('native_pid') is None and inspection.get('worker_pid') is None)
if ((stop is not None and stop.is_set())
or inspection.get('status') in ('CANCELLED', 'CANCELLED_UNRELEASED')):
return save(VerifyResult('CANCELLED', safe_to_continue=released, stderr='已取消 ICDB 检查。'))
if not confirmed_inspection(target, inspection):
return save(VerifyResult('FAIL', safe_to_continue=released,
error_category='ICDB_INSPECTION_UNCONFIRMED',
stderr='无法确认 ICDB 状态。' + str(inspection.get('detail', ''))))
if inspection['status'] == 'IN_USE':
return save(VerifyResult('BLOCKED', safe_to_continue=released,
error_category='ICDB_DATABASE_IN_USE', stderr='工程正在使用,暂未完成 ICDB 检查。'))
if inspection['repair_required']:
return save(VerifyResult('FAIL', safe_to_continue=released,
error_category='ICDB_REPAIR_REQUIRED', stderr='发现 ICDB 问题,未执行修复。'))
return save(VerifyResult('CHECKED', safe_to_continue=released,
stdout='ICDB 检查未发现异常,无需修复。'))
except InterruptedError:
return save(VerifyResult('CANCELLED', safe_to_continue=released, stderr='已取消 ICDB 检查。'))
except LibraryBusy as error:
return save(VerifyResult('BLOCKED', safe_to_continue=False,
error_category='LIBRARY_IN_USE', stderr=str(error)))
except Exception as error:
return save(VerifyResult('FAIL', safe_to_continue=not started,
return save(VerifyResult('FAIL', safe_to_continue=released,
error_category='ICDB_INSPECTION_UNCONFIRMED', stderr=f'无法确认 ICDB 状态:{error}'))
+25 -91
View File
@@ -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)
@@ -31,7 +31,6 @@ class ManagementRequest:
mapped_drive: str = ''
mapped_remote_root: str = ''
transaction_token: str = ''
check_previous_release: bool = False
@dataclass(frozen=True)
@@ -72,8 +71,6 @@ class ManagementResult:
safe_to_continue: bool
detail: str = ''
evidence_path: Path | None = None
release_proof: dict | None = None
change_report: dict | None = None
def validate_name(value):
@@ -153,22 +150,13 @@ def unfinished_operations(root):
for path in sorted(Path(root).glob('*/checkpoint.json')):
try:
record = json.loads(path.read_text(encoding='utf-8'))
if (record.get('stage') != 'complete' or record.get('safe_to_continue') is False
or record.get('status') == 'RECOVERY_REQUIRED'):
if record.get('stage') != 'complete' or record.get('safe_to_continue') is False:
results.append({**record, 'evidence_path': str(path)})
except (OSError, ValueError):
results.append({'status': 'CHECKPOINT_UNREADABLE', 'evidence_path': str(path)})
return results
def _may_have_mutated(record):
prewrite = {'preflight', 'release_check', 'catalog_before', 'baseline', 'stage_source', 'prepare_identity'}
history = record.get('history')
return (record.get('stage') not in prewrite | {'complete'} or record.get('status') == 'RECOVERY_REQUIRED'
or not isinstance(history, list) or not history
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):
from .verify_runner import VerifyRequest, run_verify
from .backup_recovery import _idle_check
@@ -186,19 +174,6 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
owner_safe = True
mutex = None
acquired = False
release_proof = None
original = None
change_report = None
def invoke(callback, *args):
nonlocal owner_safe
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):
nonlocal stage
stage = next_stage
@@ -209,38 +184,10 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
if progress:
progress({'stage': stage, 'block': request.name, 'operation': request.operation, **details})
def finish(status, detail='', safe=True):
nonlocal 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': '原生会话尚未释放,未读取写后内容'}
if safe:
try:
after = build_exclusive_library_manifest(library_root, scope=scope, progress=progress)
_write_json(root/'library-after-manifest.json', after)
before_files, after_files = original['files'], after['files']
change_report.update(status='RECORDED', detail='目标工程及共享依赖的内容差分',
added=sorted(after_files.keys()-before_files.keys()),
deleted=sorted(before_files.keys()-after_files.keys()),
modified=sorted(path for path in before_files.keys() & after_files.keys()
if before_files[path] != after_files[path]))
except Exception as error:
change_report['detail'] = f'写后内容未确认:{error}'
try:
_write_json(root/'library-changes.json', change_report)
except OSError as error:
change_report.update(status='UNCONFIRMED', evidence_error=str(error),
detail=f'变更记录保存失败:{error}')
if change_report['status'] != 'RECORDED':
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)
request.source, request.auto_verify, 'complete', status, safe, detail, report)
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())
_write_json(report, {**asdict(result), 'history': history, 'backup_policy': 'manual'})
return result
from .com_runtime import initialize_com, uninitialize_com
initialized = initialize_com()
@@ -260,13 +207,9 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
capability = adapter.capabilities().get(request.operation, Capability(False, '未验证的原生接口'))
if not capability.supported:
return finish('UNSUPPORTED', capability.reason)
unfinished_target = None
for unfinished in unfinished_operations(evidence):
if (unfinished.get('library') and Path(unfinished['library']).resolve() == canonical_library
and _may_have_mutated(unfinished) and (not unfinished.get('name')
or str(unfinished['name']).casefold() == request.name.casefold())):
unfinished_target = unfinished
break
if unfinished.get('library') and Path(unfinished['library']).resolve() == canonical_library:
return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished["evidence_path"]}', False)
source = pcb = None
if request.operation in ('add', 'update'):
if request.source is None:
@@ -276,26 +219,16 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
or evidence.is_relative_to(source.parent)
or source.parent.is_relative_to(evidence)):
raise ValueError('来源工程、目标库与操作证据必须使用独立目录。')
root = evidence/('management-' + uuid4().hex)
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)
if release_proof is not None:
checkpoint('release_check', release_proof=release_proof)
if unfinished_target:
return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}')
return finish('BLOCKED', '已有 CBB 校验/管理/恢复任务运行。', False)
if hasattr(adapter, 'bind_library_mapping'):
adapter.bind_library_mapping(request.mapped_drive, request.mapped_remote_root)
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))):
with LibraryLock(library, safe_to_release=lambda: owner_safe):
root = evidence/('management-' + uuid4().hex)
root.mkdir(parents=True, exist_ok=False)
report = root/'checkpoint.json'
work = library.parent/'ReusableBlocksLP'/request.name/'Work'
target_project, target_pcb = work/(request.name+'.prj'), work/'PCB/pcb.pcb'
if request.operation != 'add':
@@ -311,7 +244,7 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
idle_check(library, source, pcb)
checkpoint('catalog_before')
owner_safe = False
before = invoke(adapter.catalog, library, root/'before')
before = 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:
return finish('BLOCKED', '原生目录身份/流程或所有者释放未确认。仅支持已验证 DxDesigner 流程。', owner_safe)
@@ -352,29 +285,32 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
if request.operation in ('remove', 'update'):
checkpoint('native_remove')
mutated = True; owner_safe = False
native = invoke(adapter.remove, request, root/'remove')
native = adapter.remove(request, root/'remove')
owner_safe = native.safe_to_continue
if not owner_safe or not native.success:
return finish('RECOVERY_REQUIRED', native.detail, owner_safe)
return finish('RECOVERY_REQUIRED', native.detail, False)
owner_safe = False
idle_check(library, target_project, target_pcb)
after = invoke(adapter.catalog, library, root/'after-remove')
owner_safe = False
after = adapter.catalog(library, root/'after-remove')
owner_safe = after.safe_to_continue
if (not owner_safe or Path(after.library).resolve() != canonical_library or after.flow != 1
or any(e.name == request.name and e.partition == request.partition for e in after.entries)):
return finish('RECOVERY_REQUIRED', '原生移除后目录未确认目标缺失。', owner_safe)
return finish('RECOVERY_REQUIRED', '原生移除后目录未确认目标缺失。', False)
removed = True
checkpoint('removed')
if request.operation == 'remove':
return finish('REMOVED', '已由原生操作移除,重新读取目录确认不存在;应用未创建备份。')
checkpoint('native_add')
mutated = True; owner_safe = False
native = invoke(adapter.add, staged, root/'add')
native = adapter.add(staged, root/'add')
owner_safe = native.safe_to_continue
if not owner_safe or not native.success:
return finish('RECOVERY_REQUIRED' if removed or not owner_safe else 'UPLOAD_FAILED',
native.detail, owner_safe)
native.detail, owner_safe and not removed)
owner_safe = False
idle_check(library, target_project, target_pcb)
after = invoke(adapter.catalog, library, root/'after-add')
after = adapter.catalog(library, root/'after-add')
owner_safe = after.safe_to_continue
matches = [entry for entry in after.entries if entry.name == request.name
and entry.partition == request.partition]
@@ -383,7 +319,7 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
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', '原生新增后名称、分区或来源工程内容未确认一致。', owner_safe)
return finish('RECOVERY_REQUIRED', '原生新增后名称、分区或来源工程内容未确认一致。', False)
uploaded = True
checkpoint('uploaded')
if not request.auto_verify:
@@ -400,14 +336,12 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
verified.stderr or verified.library_flag_detail, owner_safe)
except Exception as error:
if uploaded:
return finish('UPLOADED_VERIFY_FAILED', str(error), owner_safe)
return finish('UPLOADED_VERIFY_FAILED', str(error), False)
status = 'RECOVERY_REQUIRED' if mutated else ('UPLOAD_FAILED' if request.operation in ('add', 'update') else 'BLOCKED')
# Bad input is never described as a native upload attempt.
if root is None and isinstance(error, ValueError):
status = 'BLOCKED'
if stage == 'release_check' and not mutated:
status = 'BLOCKED'
return finish(status, str(error), owner_safe)
return finish(status, str(error), not mutated and owner_safe and not isinstance(error, LibraryBusy))
finally:
if mutex is not None:
if acquired:
+46 -65
View File
@@ -236,13 +236,12 @@ def pcb_processes():
def is_reusable_circuit_pcb(exe, command, expected_pcb):
"""Match the ReusableCircuit session for this CBB by argument, not install layout."""
from .failed_session import _command_args
exe = os.path.normcase(str(exe or ''))
args = _command_args(str(command or ''))
command = os.path.normcase(str(command or ''))
expected = os.path.normcase(os.path.abspath(str(expected_pcb)))
return (os.path.basename(exe) == 'expeditionpcb.exe'
and '-reusablecircuit' in {arg.casefold() for arg in args[1:]}
and expected in {os.path.normcase(os.path.abspath(arg)) for arg in args[1:]})
and '-reusablecircuit' in command
and expected in command)
def select_reusable_circuit_pcb(candidates):
@@ -637,7 +636,7 @@ def execute_job(job, emit):
pcb_log_offset = snapshot_log(pcb_log)
integration_log_dir = Path(job['pcb']).parent / 'LogFiles'
integration_offsets = {}
for name in (() if job.get('diagnostic_only') else ('ForwardAnnotation.txt', 'MsgBoxResponse.log', 'PartPkg.log')):
for name in ('ForwardAnnotation.txt', 'MsgBoxResponse.log', 'PartPkg.log'):
path = integration_log_dir / name
try:
baseline = path.read_bytes()
@@ -664,8 +663,6 @@ def execute_job(job, emit):
# Inspect every source before returning a generic server/packager
# failure: either can be a consequence of a lost library session.
startup = pcb_log_reports_missing_server(job['pcb'], offset=pcb_log_offset)
if job.get('diagnostic_only'):
return startup
integration = pcb_log_reports_integration_error(job['pcb'], offsets=integration_offsets)
if 'ICDB_REPAIR_REQUIRED' in startup:
return startup
@@ -695,8 +692,6 @@ def execute_job(job, emit):
reference = match[2]
if not reference or (config.parent/reference).resolve() != library:
raise ValueError(f'DIAGNOSTIC_LIBRARY_MISMATCH: {config}: {reference}')
from .diagnostic_open import snapshot_diagnostic_logs
job['diagnostic_log_baseline'] = snapshot_diagnostic_logs(job)
else:
ensure_pcb_central_library(
job['pcb'],
@@ -713,7 +708,6 @@ def execute_job(job, emit):
# The successful background runs use the normal ReusableCircuit
# launcher. Keep the experimental Library Manager menu route opt-in
# for diagnostics only; it is not the production trigger on EE7.9.
pcb_started_ns = time.time_ns()
if bool(job.get('native_lm_verify', False)):
from .library_manager_verify import launch_library_verify
emit(stage='lm_launch', library=job['lmc_file'], block=job['block_name'])
@@ -755,51 +749,46 @@ def execute_job(job, emit):
parent_pid=worker_parent_pid or lm_pid, command=worker_command,
binding='commandline' if is_reusable_circuit_pcb(
worker_executable, worker_command, job['pcb']) else 'launcher_child')
try:
from .mentor_paths import discover_sdd_home
home = discover_sdd_home(job.get('mentor_bin'))
wdir = os.environ.get('WDIR', '').split(';')[0].strip()
if wdir or home:
log_root = Path(os.path.expandvars(wdir)) if wdir else home/'standard'
(root/'diagnostics/native-client-context.json').write_text(json.dumps({
'native_pid': worker_pid, 'started_ns': pcb_started_ns,
'client_log_root': str(log_root/'iCDB/Client/Logs'),
'database': str(Path(job['project']).parent/'database')},
ensure_ascii=False), encoding='utf-8')
except (OSError, ValueError):
pass
break
time.sleep(.2)
if worker_pid is None:
raise RuntimeError('ReusableCircuit common 启动后未观察到 wg PCB 子进程')
app, doc, pi = wait_for_target_document(
job,
lambda: win32com.client.GetActiveObject('MGCPCB.Application'),
process_alive=lambda: any(candidate_pid in {lm_pid, worker_pid, worker_parent_pid}
for candidate_pid, _, _ in pcb_processes()),
emit=emit,
error_reader=native_error,
)
identity_verified = True
if job.get('diagnostic_only'):
# Global PCB COM can wait on another design's modal window.
# Opening checks use only the newly bound process and fresh logs.
from .diagnostic_open import check_target_window
def diagnostic_emit(**event):
nonlocal diagnostic_close_attempted
if event.get('stage') == 'diagnostic_wm_close':
diagnostic_close_attempted = True
emit(**event)
checked = check_target_window(job, worker_pid, emit=diagnostic_emit,
error_reader=native_error, launcher_process=launcher_process)
released = cleanup_verify_processes(lm_pid, worker_pid, worker_parent_pid,
expected_pcb=job['pcb'], baseline_pids=pcb_before, emit=emit)
if (checked.get('status') != 'PASS' or not checked.get('native_processes_exited')
or not released or not released.get('safe_to_continue')):
raise RuntimeError(f'DIAGNOSTIC_CLOSE_UNCONFIRMED: {checked}; {released}')
from .diagnostic_open import _read_bounded
if detail := _read_bounded(native_error):
# The diagnostic opens only to establish current native evidence.
# Do not refresh integration, save/commit Cert, or edit PRJ paths.
if detail := native_error():
raise RuntimeError(detail)
pi = doc = app = None
gc.collect()
from .failed_session import close_failed_document
diagnostic_close_attempted = True
closed = close_failed_document(job, emit=emit)
if closed.get('status') != 'CLOSED':
raise RuntimeError(f'DIAGNOSTIC_CLOSE_UNCONFIRMED: {closed}')
release_deadline = time.monotonic() + 30
while True:
released = cleanup_verify_processes(lm_pid, worker_pid, worker_parent_pid,
expected_pcb=job['pcb'], baseline_pids=pcb_before, emit=emit)
if (released and released.get('safe_to_continue')
and not unreleased_addresses(job['lmc_file'], job['project'], job['pcb'])):
break
if time.monotonic() >= release_deadline:
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED: 原生会话或数据库仍占用')
time.sleep(.2)
if detail := native_error():
raise RuntimeError(detail)
completed = True
emit(stage='diagnostic_complete', status='PASS')
return {'status': 'PASS', 'stdout': 'ICDB 启动检查通过;工程及启动器已退出。'}
from .pcb_bridge import ProcessWatch
with ProcessWatch((lm_pid, worker_pid, worker_parent_pid)) as watch:
app, doc, pi = wait_for_target_document(
job, lambda: win32com.client.GetActiveObject('MGCPCB.Application'),
process_alive=watch.alive, emit=emit, error_reader=native_error)
identity_verified = True
return {'status': 'PASS', 'stdout': 'ICDB 启动检查通过;未执行集成或保存,已关闭工程。'}
# Do not acquire MGCPCBAutomationLicensing from this 64-bit Python
# worker. EE7.9 registers that automation class for the 32-bit host;
# the old, working path acquires the token inside the SysWOW64
@@ -888,8 +877,8 @@ def execute_job(job, emit):
if helper is not None and helper.poll() is None:
emit(stage='save_helper_retained', helper_pid=helper.pid)
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.
# A timed-out close helper may still own an in-flight native Close.
# Observe release below, but never start a second close helper.
pass
elif not completed and identity_verified:
try:
@@ -1005,16 +994,11 @@ def worker_main(request_path):
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
gate_deadline = time.monotonic() + WORKER_START_GATE_TIMEOUT_SECONDS
gate_deadline = time.monotonic() + 15
while not start_gate.is_file():
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
raise RuntimeError('VERIFY_CANCELLED: 启动已取消,未启动 PCB')
if time.monotonic() >= gate_deadline:
raise RuntimeError('DIALOG_AGENT_START_TIMEOUT: 弹窗代理未就绪,未启动 PCB')
time.sleep(.05)
if job.get('cancel_signal') and Path(job['cancel_signal']).exists():
raise RuntimeError('VERIFY_CANCELLED: 启动已取消,未启动 PCB')
outcome = execute_job(job, emit)
except Exception as error:
traceback.print_exc()
@@ -1460,23 +1444,23 @@ def read_library_flag(library, name, *, timeout_seconds=90, log_path=None):
import win32con
import win32process
import win32service
from pywinauto import Desktop
from pywinauto.controls.common_controls import TreeViewWrapper
executable = library_manager_path()
if not executable.is_file():
return FLAG_UNKNOWN, f'找不到 Library Manager: {executable}'
from pywinauto import Desktop
from pywinauto.controls.common_controls import TreeViewWrapper
deadline = time.monotonic() + timeout_seconds
desktop_name = 'CbbFlagRead_' + os.urandom(5).hex()
desktop = None
desktop = win32service.CreateDesktop(desktop_name, 0, win32con.GENERIC_ALL, None)
handle = None
pid = None
handled = set()
log = log_path or Path(library).parent/'LogFiles'/'cbb_flag_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(
@@ -1520,8 +1504,7 @@ def read_library_flag(library, name, *, timeout_seconds=90, log_path=None):
except Exception:
pass
try:
if desktop is not None:
desktop.CloseDesktop()
desktop.CloseDesktop()
except Exception:
pass
@@ -1550,13 +1533,12 @@ def read_library_tree_image_map(library, names, *, timeout_seconds=45, log_path=
if not executable.is_file():
return result
desktop_name = 'CbbStatusRead_' + os.urandom(5).hex()
desktop = None
desktop = win32service.CreateDesktop(desktop_name, 0, win32con.GENERIC_ALL, 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(
@@ -1610,8 +1592,7 @@ def read_library_tree_image_map(library, names, *, timeout_seconds=45, log_path=
except Exception:
pass
try:
if desktop is not None:
desktop.CloseDesktop()
desktop.CloseDesktop()
except Exception:
pass
@@ -265,8 +265,14 @@ def validate_export_output(kind, code, report, log):
def _process_snapshot():
from .owner_probe import query_process_snapshot
return query_process_snapshot(timeout_seconds=10)
import win32com.client
service = win32com.client.GetObject('winmgmts:')
try:
return [{'pid': int(p.ProcessId), 'parent': int(p.ParentProcessId or 0),
'name': str(p.Name), 'executable': str(p.ExecutablePath or '')}
for p in service.ExecQuery('SELECT ProcessId, ParentProcessId, Name, ExecutablePath FROM Win32_Process')]
finally:
service = None
def _database_released(project_root):
@@ -289,20 +295,9 @@ def _run_exports(project, root, mentor_home, timeout_seconds):
"""Observe exact exporter/descendant handles; never kill a database owner."""
import win32api, win32con, win32event, pywintypes
root = Path(root)
try:
_write_json(root/'export-launch.json', {'started': False})
except OSError as error:
return {'success': False, 'safe_to_continue': True, 'native_started': False,
'detail': str(error)}
diagnostic_warnings = []
try:
before = _process_snapshot()
except Exception as error:
return {'success': False, 'safe_to_continue': True, 'native_started': False,
'detail': str(error)}
from .backup_recovery import _native_scope_match
if any(p['name'].casefold() in _OWNER_NAMES and _native_scope_match(
p.get('command', ''), roots=(project.parent,)) is True for p in before):
_write_json(root/'export-launch.json', {'started': False})
before = _process_snapshot()
if any(p['name'].casefold() in _OWNER_NAMES for p in before):
return {'success': False, 'safe_to_continue': False, 'detail': 'An existing iCDB owner prevents isolated identity export.'}
if not _database_released(project.parent):
return {'success': False, 'safe_to_continue': False, 'detail': 'Analysis copy has unreleased native addresses or DB handles.'}
@@ -323,20 +318,14 @@ def _run_exports(project, root, mentor_home, timeout_seconds):
for kind, command, report, log in commands:
process = None
handles = {}
identities = {}
released = False
launch_attempted = False
record = {'command': command, 'kind': kind, 'success': False,
'safe_to_continue': False, 'native_started': False}
record = {'command': command, 'kind': kind, 'success': False, 'safe_to_continue': False}
try:
deadline = time.monotonic()+float(timeout_seconds)
with (root/(kind+'-stdout.txt')).open('wb') as output:
_write_json(root/'export-launch.json', {'started': True})
launch_attempted = True
record['native_started'] = None
process = subprocess.Popen(command, stdout=output, stderr=subprocess.STDOUT,
creationflags=subprocess.CREATE_NO_WINDOW)
record['native_started'] = True
record['pid'] = process.pid
descendants = {process.pid}
_write_json(root/(kind+'-process.json'), record)
@@ -347,19 +336,13 @@ def _run_exports(project, root, mentor_home, timeout_seconds):
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)]
owners = [p for p in snapshot if p['pid'] in descendants or p['name'].casefold() in _OWNER_NAMES]
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 != 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())):
released = _database_released(project.parent)
@@ -372,37 +355,15 @@ def _run_exports(project, root, mentor_home, timeout_seconds):
validate_export_output(kind, process.returncode, report, log)
record.update(success=True, detail='Native export complete and owners released.')
except Exception as error:
creation_rejected = (isinstance(error, (FileNotFoundError, PermissionError))
or getattr(error, 'winerror', None) in (2, 3, 5, 193, 206, 740))
if process is None and (not launch_attempted or creation_rejected):
# Only a known CreateProcess rejection proves that no native owner started.
released = True
record['native_started'] = False
_write_json(root/'export-launch.json', {'started': False})
record.update(detail=str(error), safe_to_continue=released)
return record
finally:
if process is not None and not released:
import json
owner_path = root/'export-owner.json'
try:
owner = json.loads(owner_path.read_text('utf-8')) if owner_path.is_file() else {}
except (ValueError, OSError):
owner = {} # Preserve unknown ownership; never lose the live handles.
_retained_exports.append((process, handles, {
'library': owner.get('library'), 'project': str(project), 'analysis_root': str(root)}))
_retained_exports.append((process, handles))
else:
for handle in handles.values(): handle.Close()
try:
_write_json(root/(kind+'-process.json'), record)
except OSError as error:
if not released:
raise
warning = 'Export diagnostic write failed: '+str(error)
diagnostic_warnings.append(warning)
record['detail'] = (record.get('detail', '')+'\n'+warning).strip()
return {'success': True, 'safe_to_continue': True,
'detail': '\n'.join(['All three native exports completed and released.', *diagnostic_warnings])}
_write_json(root/(kind+'-process.json'), record)
return {'success': True, 'safe_to_continue': True, 'detail': 'All three native exports completed and released.'}
def capture_identity(source, evidence_root, *, expected_library, owner_library, mentor_home,
@@ -413,22 +374,18 @@ def capture_identity(source, evidence_root, *, expected_library, owner_library,
from .scoped_manifest import copy_verified
from .native_export_guard import begin_export_analysis, finish_export_analysis
import win32event, win32con
root = Path(evidence_root)
try:
root = root.absolute()
source, pcb, top = source_project(source)
library = Path(owner_library)
lease = LibraryLock(library)
if owned_snapshot(lease.path) is None:
raise ValueError('Native identity capture requires a current-thread transaction library lease.')
if (root.resolve().is_relative_to(source.parent) or source.parent.is_relative_to(root.resolve())
or root.resolve().is_relative_to(library.parent.resolve())):
raise ValueError('Native identity evidence must be independent of source and library.')
check_exporters(mentor_home)
root.mkdir(parents=True, exist_ok=False)
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
except Exception as error:
return IdentityOutcome(None, True, str(error), root)
source, pcb, top = source_project(source)
root = Path(evidence_root).absolute()
library = Path(owner_library)
lease = LibraryLock(library)
if owned_snapshot(lease.path) is None:
raise ValueError('Native identity capture requires a current-thread transaction library lease.')
if (root.resolve().is_relative_to(source.parent) or source.parent.is_relative_to(root.resolve())
or root.resolve().is_relative_to(library.parent.resolve())):
raise ValueError('Native identity evidence must be independent of source and library.')
check_exporters(mentor_home)
root.mkdir(parents=True, exist_ok=False)
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
acquired = False
owner_safe = True
outcome = IdentityOutcome(None, True, 'Identity capture did not start.', root)
@@ -446,11 +403,10 @@ def capture_identity(source, evidence_root, *, expected_library, owner_library,
export_token = begin_export_analysis(library, root, clone)
owner_safe = False
native = _run_exports(clone, root, mentor_home, timeout_seconds)
if native.get('safe_to_continue') is True:
finish_export_analysis(library, export_token,
native_not_started=native.get('native_started') is False)
owner_safe = True
_write_json(root/'native-outcome.json', native)
if native.get('safe_to_continue') is True:
finish_export_analysis(library, export_token)
owner_safe = True
if not owner_safe or not native.get('success'):
outcome = IdentityOutcome(None, owner_safe, native.get('detail', 'Native export failed.'), root)
else:
@@ -467,10 +423,6 @@ def capture_identity(source, evidence_root, *, expected_library, owner_library,
finally:
if acquired: win32event.ReleaseMutex(mutex)
mutex.Close()
try:
_write_json(root/'identity.json', {'identity': outcome.identity, 'safe_to_continue': outcome.safe_to_continue,
'detail': outcome.detail, 'policy': POLICY})
except OSError as error:
outcome = IdentityOutcome(outcome.identity, outcome.safe_to_continue,
outcome.detail+'\nIdentity summary write failed: '+str(error), root)
_write_json(root/'identity.json', {'identity': outcome.identity, 'safe_to_continue': outcome.safe_to_continue,
'detail': outcome.detail, 'policy': POLICY})
return outcome
+12 -53
View File
@@ -7,16 +7,11 @@ from uuid import uuid4
from .management import _write_json
def assert_retained_exports_idle(library=None):
def assert_retained_exports_idle():
import win32con, win32event
from .native_engineering_identity import _retained_exports
from .library_lock import LibraryBusy
for entry in _retained_exports:
process, handles = entry[:2]
scope = entry[2] if len(entry) > 2 else {}
if (library is not None and scope.get('library')
and Path(scope['library']).resolve() != Path(library).resolve()):
continue
for process, handles in _retained_exports:
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.')
@@ -45,33 +40,26 @@ def begin_export_analysis(library, root, project):
@contextmanager
def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, unstarted_token=''):
def prove_export_copies_released(library):
"""Fresh process and exclusive-copy proof, including after interpreter exit."""
import win32file, win32con, pywintypes
from .library_lock import blocker_path, checkpoint_record, _supervisor_alive, LibraryBusy
from .native_engineering_identity import _process_snapshot, _OWNER_NAMES
from .scoped_manifest import scan_tree
assert_retained_exports_idle()
library = Path(library).resolve()
assert_retained_exports_idle(library)
marker = blocker_path(library)
checkpoint = checkpoint_record(marker)
if marker.exists() and checkpoint is None:
if not allow_unknown_checkpoint:
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.
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
raise LibraryBusy('Invalid library checkpoint cannot release export ownership.')
if checkpoint is None or 'export_analysis' not in checkpoint:
yield []
return
records = checkpoint['export_analysis']
if not isinstance(records, list) or not records:
raise LibraryBusy('Invalid export-analysis ownership record.')
snapshot = None
owners = [p for p in _process_snapshot() if p['name'].casefold() in _OWNER_NAMES]
if owners: raise LibraryBusy(f'Native identity owners remain active: {owners}')
copies = []
with ExitStack() as stack:
for record in records:
@@ -90,43 +78,15 @@ def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, uns
processes = [root/(kind+'-process.json') for kind in ('ascii', 'csv', 'edif')
if (root/(kind+'-process.json')).exists()]
if not processes:
launch_path = root/'export-launch.json'
launch = json.loads(launch_path.read_text('utf-8')) if launch_path.exists() else None
unstarted_current_lease = False
if unstarted_token and record['token'] == unstarted_token:
# In-memory no-start proof may clear its own guard even
# when creating the first launch record failed.
from .management_transaction import current_lease
current = current_lease(library)
unstarted_current_lease = (record['lease_id'] == current['lease_id']
and record['supervisor_pid'] == current['supervisor_pid'])
if launch != {'started': False} and not (launch is None and unstarted_current_lease):
launch = json.loads((root/'export-launch.json').read_text(encoding='utf-8'))
if launch != {'started': False}:
raise ValueError('Export launch has no confirmed process record.')
else:
if snapshot is None:
snapshot = _process_snapshot()
from .backup_recovery import _native_scope_match
if any(p['name'].casefold() in _OWNER_NAMES and _native_scope_match(
p.get('command', ''), roots=(project.parent,)) is True for p in snapshot):
raise LibraryBusy('A native identity owner is bound to this analysis copy.')
for path in processes:
process = json.loads(path.read_text(encoding='utf-8'))
if ('pid' not in process and process.get('safe_to_continue') is True
and process.get('native_started') is False
and json.loads((root/'export-launch.json').read_text('utf-8')) == {'started': False}):
continue # Failed CreateProcess: no native ownership was acquired.
pids = process.get('observed_pids', []) + [process['pid']]
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', [])}
def original_alive(pid):
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'):
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):
if any(_supervisor_alive(pid) for pid in pids):
raise LibraryBusy('A recorded export process or descendant remains alive.')
entries = scan_tree(root/'project')
if any(path.name.casefold() == 'saddress.adr' for path in entries):
@@ -145,10 +105,9 @@ def prove_export_copies_released(library, *, allow_unknown_checkpoint=False, uns
yield copies
def finish_export_analysis(library, token, *, native_not_started=False):
def finish_export_analysis(library, token):
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 ''):
with _guard, prove_export_copies_released(library):
marker = blocker_path(library)
checkpoint = checkpoint_record(marker)
records = checkpoint.get('export_analysis', []) if checkpoint else []
+52 -135
View File
@@ -21,12 +21,6 @@ from .scoped_manifest import hash_file
from .network_path import absolute_preserving_drive
_retained_workers = []
class NativeOperationError(RuntimeError):
def __init__(self, detail, *, safe_to_continue):
super().__init__(detail)
self.safe_to_continue = safe_to_continue
# Coordinator-owned Create/Add/conflict/update/remove/backup-reimport evidence:
# diagnostics/issue2-native-crud-20261103/engine-e2e/cycle-result.json
_PRODUCTION_ADD_VALIDATED = True
@@ -68,28 +62,6 @@ class NativeManagementAdapter:
self.timeout_seconds = timeout_seconds
self.mapped_drive = ''
self.mapped_remote_root = ''
self._pending_workers = {}
def release_confirmed(self, library):
"""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:
return False
worker, evidence = pending
if worker.poll() is None:
return False
try:
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:
_retained_workers.remove(worker)
del self._pending_workers[key]
return True
def bind_library_mapping(self, drive, remote_root):
self.mapped_drive = drive or ''
@@ -133,18 +105,14 @@ class NativeManagementAdapter:
}
def _worker(self, job, evidence):
try:
evidence = Path(evidence)
evidence.mkdir(parents=True, exist_ok=False)
desktop = 'CbbManagement_' + uuid4().hex[:12]
timeout = float(job.get('timeout_seconds', self.timeout_seconds))
job = {**job, 'desktop': desktop, 'mentor_home': str(self.home or ''),
'mapped_drive': job.get('mapped_drive', self.mapped_drive),
'mapped_remote_root': job.get('mapped_remote_root', self.mapped_remote_root),
'timeout_seconds': timeout, 'supervisor_pid': os.getpid()}
except Exception as error:
error.safe_to_continue = True
raise
evidence = Path(evidence)
evidence.mkdir(parents=True, exist_ok=False)
desktop = 'CbbManagement_' + uuid4().hex[:12]
timeout = float(job.get('timeout_seconds', self.timeout_seconds))
job = {**job, 'desktop': desktop, 'mentor_home': str(self.home or ''),
'mapped_drive': job.get('mapped_drive', self.mapped_drive),
'mapped_remote_root': job.get('mapped_remote_root', self.mapped_remote_root),
'timeout_seconds': timeout, 'supervisor_pid': os.getpid()}
if job['operation'] == 'add':
import win32con, win32event
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
@@ -190,23 +158,6 @@ class NativeManagementAdapter:
return self._launch_worker(job, evidence)
def _launch_worker(self, job, evidence):
state = {'attempted': False, 'worker': None, 'released': False}
try:
return self._launch_worker_observed(job, evidence, state)
except Exception as error:
proof = getattr(error, 'worker_launch_release', None)
no_launch = (isinstance(proof, dict) and proof.get('safe_to_continue') is True
and proof.get('process_created') is False and proof.get('worker_exited') is True
and proof.get('remaining_pids') == [])
error.safe_to_continue = (not state['attempted'] or state['released']
or (state['worker'] is None and no_launch))
if state['worker'] is not None and not error.safe_to_continue:
if state['worker'] not in _retained_workers:
_retained_workers.append(state['worker'])
self._pending_workers[str(Path(job['library']).resolve()).casefold()] = (state['worker'], evidence)
raise
def _launch_worker_observed(self, job, evidence, state):
from .desktop_worker import DesktopWorker
request_path = evidence/'request.json'
desktop, timeout = job['desktop'], job['timeout_seconds']
@@ -217,17 +168,13 @@ class NativeManagementAdapter:
_write_json(request_path, job)
command = ([sys.executable] if getattr(sys, 'frozen', False)
else [sys.executable, '-m', 'cbb_refresh_verify'])
state['attempted'] = True
worker = (self.worker_factory or DesktopWorker)(command + ['--management-worker', str(request_path)], desktop)
state['worker'] = worker
worker.cbb_library = str(Path(job['library']).resolve())
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)
if add_job:
(evidence/'cancel-native-add.signal').touch()
return {'success': False, 'safe_to_continue': False,
@@ -236,7 +183,6 @@ class NativeManagementAdapter:
result = json.loads((evidence/'result.json').read_text(encoding='utf-8'))
if not isinstance(result.get('safe_to_continue'), bool):
raise ValueError('原生释放记录缺失')
state['released'] = result['safe_to_continue']
return result
except (OSError, ValueError) as error:
return {'success': False, 'safe_to_continue': False, 'detail': str(error)}
@@ -246,8 +192,7 @@ class NativeManagementAdapter:
def catalog(self, 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)
raise RuntimeError(result.get('detail', '原生目录复读未确认,禁止文件夹回退。'))
return Catalog(Path(result['library']), int(result['flow']),
tuple(CatalogEntry(**entry) for entry in result['entries']), result['safe_to_continue'])
@@ -283,65 +228,48 @@ class NativeManagementAdapter:
from .management_transaction import current_lease, prepare_transaction
from .management import source_project
from .backup_recovery import _align_library
if not self.capabilities()['add'].supported:
raise ValueError(self.capabilities()['add'].reason)
try:
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)
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.')
_align_library(staged, pcb, request.library)
if asset_identity(staged, request.library) != original_assets:
raise ValueError('Staged engineering assets differ from the original source.')
except Exception as error:
except ValueError as error:
return request, IdentityOutcome(None, True, str(error), Path(root))
current_lease(request.library)
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.')
_align_library(staged, pcb, request.library)
if asset_identity(staged, request.library) != original_assets:
raise ValueError('Staged engineering assets differ from the original source.')
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:
token = prepare_transaction(request, root, proof.identity, mentor_home=self.home,
fixture=getattr(self, '_fixture_authority', None))
except Exception as error:
return request, IdentityOutcome(None, proof.safe_to_continue, str(error), Path(root))
token = prepare_transaction(request, root, proof.identity, mentor_home=self.home,
fixture=getattr(self, '_fixture_authority', None))
return replace(request, transaction_token=token), proof
def _add_transaction(self, request, evidence):
from contextlib import contextmanager
from .management_transaction import validate_transaction
from .library_lock import LibraryLock
from .native_engineering_identity import capture_identity, project_library
from .management import source_project
from .backup_recovery import _align_library, _idle_check
try:
job = {'operation': 'add', 'authority_kind': 'management', 'transaction_nonce': request.transaction_token,
'library': str(absolute_preserving_drive(request.library)), 'source': str(request.source),
'name': request.name, 'partition': request.partition, 'top_level_block': request.top_level_block,
'source_identity': engineering_identity(request.source), 'supervisor_pid': os.getpid(),
'mentor_home': str(self.home), 'timeout_seconds': request.timeout_seconds,
'mapped_drive': request.mapped_drive, 'mapped_remote_root': request.mapped_remote_root}
prepared = validate_transaction(job, evidence.parent)
except Exception as error:
error.safe_to_continue = True
raise
owner_safe = True
@contextmanager
def preserve_release():
nonlocal owner_safe
try:
yield
except Exception as error:
owner_safe = getattr(error, 'safe_to_continue', owner_safe) is True
error.safe_to_continue = owner_safe
raise
with LibraryLock(request.library, safe_to_release=lambda: owner_safe), preserve_release():
owner_safe = False
job = {'operation': 'add', 'authority_kind': 'management', 'transaction_nonce': request.transaction_token,
'library': str(absolute_preserving_drive(request.library)), 'source': str(request.source),
'name': request.name, 'partition': request.partition, 'top_level_block': request.top_level_block,
'source_identity': engineering_identity(request.source), 'supervisor_pid': os.getpid(),
'mentor_home': str(self.home), 'timeout_seconds': request.timeout_seconds,
'mapped_drive': request.mapped_drive, 'mapped_remote_root': request.mapped_remote_root}
prepared = validate_transaction(job, evidence.parent)
owner_safe = False
with LibraryLock(request.library, safe_to_release=lambda: owner_safe):
result = self._worker(job, evidence)
owner_safe = result.get('safe_to_continue') is True
if not owner_safe or not result.get('success'):
return NativeOutcome(False, owner_safe, result.get('detail', 'Native Add failed.'), evidence_path=evidence)
owner_safe = False
# The native editor may leave PCB/pcb.prj relative to the staged
# location. Correct only documented library-reference tokens after
# its owner has exited, then reopen the native catalog independently.
@@ -349,10 +277,12 @@ class NativeManagementAdapter:
work = Path(request.library).parent/'ReusableBlocksLP'/request.name/'Work'
projects = list(work.glob('*.prj'))
if len(projects) != 1:
return NativeOutcome(True, owner_safe, 'Registered engineering project is not unique.',
owner_safe = False
return NativeOutcome(True, False, 'Registered engineering project is not unique.',
identity_matches=False, evidence_path=evidence)
target, pcb, _ = source_project(projects[0], request.top_level_block)
_idle_check(request.library, target, pcb)
owner_safe = False
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}
@@ -361,13 +291,13 @@ class NativeManagementAdapter:
raise ValueError('Registered project references do not resolve to the exact target library.')
_write_json(evidence/'reference-alignment.json', {'before': before_refs,
'after': {str(p): hash_file(p) for p in project_files}, 'library': job['library']})
owner_safe = False
catalog = self.catalog(request.library, evidence/'reopen-aligned')
owner_safe = catalog.safe_to_continue
entries = [entry for entry in catalog.entries if entry.name == request.name and entry.partition == request.partition]
if (not owner_safe or Path(catalog.library).resolve() != Path(request.library).resolve()
or catalog.flow != 1 or len(entries) != 1):
return NativeOutcome(True, owner_safe, 'Aligned target did not reopen with the exact catalog identity.',
owner_safe = False
return NativeOutcome(True, False, 'Aligned target did not reopen with the exact catalog identity.',
identity_matches=False, evidence_path=evidence)
owner_safe = False
proof = capture_identity(target, evidence/'registered-identity', expected_library=request.library,
@@ -976,21 +906,17 @@ def _catalog_native(job, root):
def _catalog_com(job, root):
import pythoncom, win32com.client, win32con, win32gui, win32process
from .mentor_adapter import _process_details
try:
if job['operation'] == 'add':
if job.get('authority_kind') == 'management':
from .management_transaction import validate_transaction
validate_transaction(job, root.parent)
else:
validate_owned_fixture_add(job, root)
desktop, name = _current_desktop()
if name != job['desktop'] or not name.startswith('CbbManagement_'):
raise RuntimeError('拒绝在非本次私有桌面读取原生目录。')
if _process_details('LibraryManager.exe'):
raise RuntimeError('已有 Library Manager 运行,请关闭后重试。')
except Exception as error:
error.safe_to_continue = True
raise
if job['operation'] == 'add':
if job.get('authority_kind') == 'management':
from .management_transaction import validate_transaction
validate_transaction(job, root.parent)
else:
validate_owned_fixture_add(job, root)
desktop, name = _current_desktop()
if name != job['desktop'] or not name.startswith('CbbManagement_'):
raise RuntimeError('拒绝在非本次私有桌面读取原生目录。')
if _process_details('LibraryManager.exe'):
raise RuntimeError('已有 Library Manager 运行,请关闭后重试。')
stop = threading.Event()
refused = []
observed = []
@@ -1133,7 +1059,7 @@ def management_worker_main(request_path):
request_path = Path(request_path)
root = request_path.parent
job = json.loads(request_path.read_text(encoding='utf-8'))
result = {'success': False, 'safe_to_continue': True}
result = {'success': False, 'safe_to_continue': False}
try:
_, desktop = _current_desktop()
if desktop != job['desktop'] or not desktop.startswith('CbbManagement_'):
@@ -1151,7 +1077,6 @@ def management_worker_main(request_path):
raise ValueError('Native Add requires Logical-Physical.')
if engineering_identity(job['source']) != job.get('source_identity'):
raise ValueError('Staged source engineering identity changed before native Add.')
result['safe_to_continue'] = False
result = _catalog_native(job, root)
elif job['operation'] == 'remove':
adapter = NativeManagementAdapter(mentor_home=job['mentor_home'])
@@ -1165,13 +1090,8 @@ def management_worker_main(request_path):
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:
result['safe_to_continue'] = False
try:
process = subprocess.Popen(command, stdout=output, stderr=subprocess.STDOUT,
creationflags=subprocess.CREATE_NO_WINDOW)
except (FileNotFoundError, PermissionError):
result['safe_to_continue'] = True
raise
process = subprocess.Popen(command, stdout=output, stderr=subprocess.STDOUT,
creationflags=subprocess.CREATE_NO_WINDOW)
_write_json(root/'native-process.json', {'pid': process.pid, 'command': command})
# Never terminate this native database owner on timeout.
try:
@@ -1179,15 +1099,12 @@ def management_worker_main(request_path):
except subprocess.TimeoutExpired:
result.update(detail=f'TIMEOUT: CleanWGLib PID {process.pid} 尚未释放')
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)
safe_to_continue=True, detail=text, exit_code=code)
else:
raise ValueError('未验证的原生管理操作')
except Exception as error:
if getattr(error, 'safe_to_continue', None) is True:
result['safe_to_continue'] = True
result['detail'] = str(error)
result['exception'] = _exception_details(error)
finally:
+16 -101
View File
@@ -9,20 +9,6 @@ import ntpath
import os
from pathlib import Path
from typing import Protocol
from functools import wraps
from threading import RLock
from weakref import WeakValueDictionary
_retained_path_leases = {}
_live_path_leases = WeakValueDictionary()
_path_lease_guard = RLock()
def _lease_locked(method):
@wraps(method)
def locked(*args, **kwargs):
with _path_lease_guard: return method(*args, **kwargs)
return locked
class NetworkPathError(RuntimeError):
@@ -59,35 +45,23 @@ class WindowsWNetBackend:
def __init__(self) -> None:
self._mpr = ctypes.WinDLL("mpr", use_last_error=True)
self._kernel32 = ctypes.WinDLL("kernel32", use_last_error=True)
self._unavailable_drives = set()
def mapping(self, drive: str) -> str | None:
size = wintypes.DWORD(32768)
buffer = ctypes.create_unicode_buffer(size.value)
error = self._mpr.WNetGetConnectionW(drive, buffer, ctypes.byref(size))
if error == 0:
return buffer.value
if error == self.ERROR_NOT_CONNECTED:
return None
raise OSError(error, f"WNetGetConnectionW({drive})")
def mappings(self) -> dict[str, str]:
result: dict[str, str] = {}
self._unavailable_drives = set()
for code in range(ord("D"), ord("Z") + 1):
drive = f"{chr(code)}:"
try:
remote = self.mapping(drive)
except OSError:
self._unavailable_drives.add(drive)
continue
if remote:
result[drive] = remote
size = wintypes.DWORD(32768)
buffer = ctypes.create_unicode_buffer(size.value)
error = self._mpr.WNetGetConnectionW(drive, buffer, ctypes.byref(size))
if error == 0:
result[drive] = buffer.value
elif error != self.ERROR_NOT_CONNECTED:
raise OSError(error, f"WNetGetConnectionW({drive})")
return result
def used_drives(self) -> set[str]:
mask = int(self._kernel32.GetLogicalDrives())
return getattr(self, '_unavailable_drives', set()) | {
return {
f"{chr(ord('A') + index)}:"
for index in range(26)
if mask & (1 << index)
@@ -114,14 +88,6 @@ def _same_remote(left: str, right: str) -> bool:
return ntpath.normcase(ntpath.normpath(left)) == ntpath.normcase(ntpath.normpath(right))
def _mapping(backend, drive):
direct = getattr(backend, 'mapping', None)
if callable(direct):
return direct(drive)
return next((value for key, value in backend.mappings().items()
if str(key).upper().rstrip('\\/') == drive.upper()), None)
def ensure_mapped_drive_visible(drive: str, remote_root: str, *,
backend: WNetBackend | None = None) -> dict[str, object]:
"""Ensure a worker process can see the mapped drive used by Mentor.
@@ -142,11 +108,13 @@ def ensure_mapped_drive_visible(drive: str, remote_root: str, *,
normalized_drive = raw_drive.upper()
backend = backend or WindowsWNetBackend()
try:
current = _mapping(backend, normalized_drive)
mappings = backend.mappings()
except OSError as error:
raise NetworkPathError(
f"NETWORK_UNAVAILABLE: 无法读取网络盘映射 {normalized_drive}: {error}"
) from error
current = next((value for key, value in mappings.items()
if str(key).upper().rstrip('\\/') == normalized_drive), None)
if current:
if _same_remote(current, raw_remote):
return {'drive': normalized_drive, 'remote_root': current, 'created': False}
@@ -212,11 +180,7 @@ class LibraryPathLease:
_closed: bool = False
_retained_for_recovery: bool = False
def __post_init__(self):
with _path_lease_guard: _live_path_leases[id(self)] = self
@classmethod
@_lease_locked
def acquire(cls, path, *, backend: WNetBackend | None = None) -> "LibraryPathLease":
raw = _normalize_input_path(path)
if not raw.startswith("\\\\"):
@@ -225,7 +189,8 @@ class LibraryPathLease:
if drive:
try:
backend = backend or WindowsWNetBackend()
remote = _mapping(backend, drive.upper()) or ''
remote = next((value for key, value in backend.mappings().items()
if str(key).upper().rstrip('\\/') == drive.upper()), '')
except (OSError, AttributeError):
remote = ''
return cls(local, local, drive.upper(), remote, False, backend)
@@ -260,31 +225,10 @@ class LibraryPathLease:
f"NETWORK_UNAVAILABLE: 无法挂载中心库 {remote_root}: {error}"
) from error
@_lease_locked
def retain_for_recovery(self) -> None:
"""Keep the Mentor drive available to a retained native session."""
self._retained_for_recovery = True
_retained_path_leases[id(self)] = self
@_lease_locked
def release_after_recovery(self, proof) -> bool:
"""Restore normal mapping lifetime after this library's release proof."""
if not isinstance(proof, dict) or proof.get('status') != 'RELEASE_CONFIRMED':
return False
candidates = [str(path) for path in (self.display_path, self.mentor_path)
if str(path).casefold().endswith('.lmc')]
drive, tail = ntpath.splitdrive(str(self.mentor_path))
if (self.remote_root and drive.upper() == self.drive.upper()
and str(self.mentor_path).casefold().endswith('.lmc')):
candidates.append(self.remote_root + tail)
library = str(proof.get('library') or '')
if not any(_same_remote(library, candidate) for candidate in candidates):
return False
self._retained_for_recovery = False
_retained_path_leases.pop(id(self), None)
return True
@_lease_locked
def transfer_ownership(self, other) -> None:
"""Keep a shared mapping alive for the currently loaded library."""
if (isinstance(other, LibraryPathLease) and not other._closed
@@ -293,28 +237,16 @@ class LibraryPathLease:
other.created, other._backend = True, self._backend
self.created = False
@_lease_locked
def close(self) -> None:
if self._closed:
return
if self._retained_for_recovery:
self._closed = True
if self._retained_for_recovery or not self.created or self._backend is None or not self.drive:
return
if not self.created or self._backend is None or not self.drive:
self._closed = True
return
for live in tuple(_live_path_leases.values()):
same_backend = (live._backend is self._backend or
isinstance(self._backend, WindowsWNetBackend) and isinstance(live._backend, WindowsWNetBackend))
if live is not self and not live._closed and same_backend:
self.transfer_ownership(live)
if not self.created:
self._closed = True
return
try:
current = _mapping(self._backend, self.drive)
current = self._backend.mappings().get(self.drive)
if current and _same_remote(current, self.remote_root):
self._backend.cancel_mapping(self.drive)
self._closed = True
except OSError as error:
raise NetworkPathError(
f"NETWORK_UNAVAILABLE: 释放临时盘符 {self.drive} 失败: {error}"
@@ -325,20 +257,3 @@ class LibraryPathLease:
def __exit__(self, exc_type, exc_value, traceback) -> None:
self.close()
def release_retained_path_leases(proof, *, current_lease=None) -> int:
"""Recover matching leases even after the UI dropped its old reference."""
released = 0
for lease in tuple(_retained_path_leases.values()):
if not lease.release_after_recovery(proof):
continue
if lease is not current_lease:
lease.transfer_ownership(current_lease)
try:
lease.close()
except NetworkPathError:
_retained_path_leases[id(lease)] = lease
raise
released += 1
return released
-44
View File
@@ -1,44 +0,0 @@
"""Cooperative FIFO admission for this application's native operations."""
from threading import Condition
class QueueCancelled(RuntimeError):
pass
class NativeQueue:
def __init__(self):
self.condition = Condition()
self.pending = []
self.active = False
def wake(self):
with self.condition: self.condition.notify_all()
def run(self, action, *, stop=None, waiting=None, ready=lambda: True):
ticket = object()
acquired, notified = False, False
with self.condition: self.pending.append((ticket, ready))
try:
while not acquired:
with self.condition:
if stop is not None and stop.is_set():
raise QueueCancelled('已取消排队,未启动原生操作。')
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 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 action()
finally:
with self.condition:
self.pending = [entry for entry in self.pending if entry[0] is not ticket]
if acquired: self.active = False
self.condition.notify_all()
+10 -37
View File
@@ -11,20 +11,9 @@ def query_owners(names, *, timeout_seconds=10):
names = tuple(names)
if not names or any(not re.fullmatch(r'[\w.-]+\.exe', name, re.I) for name in names):
raise ValueError('OWNER_QUERY_INVALID')
return _query_processes(names, timeout_seconds=timeout_seconds)
def query_process_snapshot(*, timeout_seconds=10):
"""Bound a complete process tree; retain unknown executable descendants."""
return _query_processes(None, timeout_seconds=timeout_seconds)
def _query_processes(names, *, timeout_seconds):
full_snapshot = names is None
request = {'snapshot_version': 1} if full_snapshot else {'names': names}
with tempfile.TemporaryDirectory(prefix='cbb-owner-probe-') as directory:
job = Path(directory)/'request.json'
job.write_text(json.dumps(request), encoding='utf-8')
job.write_text(json.dumps({'names': names}), encoding='utf-8')
command = ([sys.executable] if getattr(sys, 'frozen', False) else
[sys.executable, '-m', 'cbb_refresh_verify']) + ['--owner-probe', str(job)]
try:
@@ -38,20 +27,13 @@ def _query_processes(names, *, timeout_seconds):
try:
record = json.loads(job.with_name('result.json').read_text('utf-8'))
rows = record['owners']
identity_matches = (type(record.get('snapshot_version')) is int and record['snapshot_version'] == 1
if full_snapshot else record.get('names') == list(names))
if result.returncode != 0 or not identity_matches or not isinstance(rows, list):
if result.returncode != 0 or record['names'] != list(names) or not isinstance(rows, list):
raise ValueError('invalid result')
seen = set()
for row in rows:
if (type(row['pid']) is not int or row['pid'] < (0 if full_snapshot else 1)
or row['pid'] in seen or not isinstance(row['name'], str) or not row['name']
or not full_snapshot and row['name'].casefold() not in {n.casefold() for n in names}
or full_snapshot and not isinstance(row['created'], str)
if (type(row['pid']) is not int or row['pid'] <= 0 or row['name'].casefold() not in {n.casefold() for n in names}
or not isinstance(row['command'], str) or not isinstance(row['executable'], str)
or type(row['parent']) is not int or row['parent'] < 0):
raise ValueError('invalid owner')
seen.add(row['pid'])
return rows
except (OSError, ValueError, KeyError, TypeError, AttributeError) as error:
raise RuntimeError('OWNER_QUERY_UNCONFIRMED: 进程查询未返回有效证据') from error
@@ -61,28 +43,19 @@ def owner_probe_main(job):
import pythoncom
import win32com.client
job = Path(job)
request = json.loads(job.read_text('utf-8'))
full_snapshot = request == {'snapshot_version': 1} and type(request.get('snapshot_version')) is int
names = request.get('names')
if not full_snapshot:
if (not isinstance(names, list) or not names
or any(not isinstance(name, str) or not re.fullmatch(r'[\w.-]+\.exe', name, re.I) for name in names)):
return 1
names = json.loads(job.read_text('utf-8'))['names']
if not names or any(not re.fullmatch(r'[\w.-]+\.exe', name, re.I) for name in names):
return 1
pythoncom.CoInitialize()
try:
service = win32com.client.GetObject('winmgmts:')
query = ('SELECT ProcessId,Name,CommandLine,ExecutablePath,ParentProcessId' +
(',CreationDate' if full_snapshot else '') + ' FROM Win32_Process')
if not full_snapshot:
query += ' WHERE ' + ' OR '.join(f"Name='{name}'" for name in names)
query = 'SELECT ProcessId,Name,CommandLine,ExecutablePath,ParentProcessId FROM Win32_Process WHERE ' + ' OR '.join(
f"Name='{name}'" for name in names)
rows = [{'pid': int(item.ProcessId), 'name': str(item.Name),
'command': str(item.CommandLine or ''), 'executable': str(item.ExecutablePath or ''),
'parent': int(item.ParentProcessId or 0),
**({'created': str(item.CreationDate or '')} if full_snapshot else {})}
for item in service.ExecQuery(query)]
'parent': int(item.ParentProcessId or 0)} for item in service.ExecQuery(query)]
service = None
response = {'snapshot_version': 1} if full_snapshot else {'names': names}
job.with_name('result.json').write_text(json.dumps({**response, 'owners': rows}), encoding='utf-8')
job.with_name('result.json').write_text(json.dumps({'names': names, 'owners': rows}), encoding='utf-8')
return 0
finally:
pythoncom.CoUninitialize()
+15 -29
View File
@@ -91,35 +91,6 @@ def require_document_identity(document, job):
return integration
class ProcessWatch:
"""Hold this task's native handles; repeated COM attach polls never run WMI."""
def __init__(self, pids):
self.pids = set(int(pid) for pid in pids if pid)
self.handles = None
def __enter__(self):
return self
def alive(self):
import pywintypes, win32api, win32con, win32event
if self.handles is None:
self.handles = []
try:
for pid in self.pids:
try:
self.handles.append(win32api.OpenProcess(win32con.SYNCHRONIZE, False, pid))
except pywintypes.error as error:
if error.winerror != 87: raise
except Exception:
self.__exit__(None, None, None)
raise
return any(win32event.WaitForSingleObject(h, 0) != win32con.WAIT_OBJECT_0 for h in self.handles)
def __exit__(self, *_):
for handle in self.handles or (): handle.Close()
self.handles = []
def wait_for_target_document(job, app_provider, *, process_alive, emit=lambda **event: None,
error_reader=None, sleep=time.sleep):
"""Wait for the exact launched document; the parent process owns timeout."""
@@ -160,3 +131,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 退出均已确认。'}
-689
View File
@@ -1,689 +0,0 @@
"""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
import time
from uuid import uuid4
from .owner_probe import query_process_snapshot
from .native_engineering_identity import _OWNER_NAMES
_NAMES = {'expeditionpcb.exe', 'librarymanager.exe', 'icdbprojectbackup.exe',
'viewdraw.exe', 'icdbnetserver.exe', 'icdbserver.exe',
'reuseblockimporter.exe', 'cleanwglib.exe', 'cscript.exe', 'wscript.exe'} | _OWNER_NAMES
_WORKER_NAMES = {'python.exe', 'pythonw.exe', 'cbbrefreshverify.exe'}
_WORKER_FLAGS = ('--verify-worker', '--repair-worker', '--management-worker', '--native-backup-worker')
_FORCE_CLIENT_NAMES = {'expeditionpcb.exe', 'librarymanager.exe', 'viewdraw.exe', 'icdbprojectbackup.exe'}
def force_block_reason(row):
"""A library path proves scope, never exclusive ownership of a server."""
if row.get('scope_confirmed') is not True:
return '进程归属未确认,不允许强制结束'
name = str(row.get('name', '')).casefold()
if name not in _FORCE_CLIENT_NAMES:
return '服务器或其他受保护进程仅供观察,不允许强制结束'
if (not row.get('created_handle') or not row.get('image')
or Path(row['image']).name.casefold() != name):
return '客户端身份未确认,不允许强制结束'
if (row.get('force_user_confirmed') is not True or not row.get('owner_sid')
or not isinstance(row.get('session_id'), int)):
return '未确认属于当前用户和 Windows 会话,不允许强制结束'
activity = row.get('native_activity', {})
if activity.get('status') in ('ACTIVE', 'UNCONFIRMED'):
return activity.get('detail', '原生操作状态未确认')+';请查看进展或请求原生取消后重新检查'
if name == 'icdbprojectbackup.exe' and activity.get('status') != 'IDLE':
return '备份/恢复/修复状态未确认,请重新检查'
return ''
def native_activity(name, windows, *, incomplete=None):
if incomplete or 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):
return {'status': 'ACTIVE', 'detail': '原生窗口显示操作进行中'}
if name.casefold() == 'icdbprojectbackup.exe':
main = [w for w in windows if w['class'].startswith('Afx:')
and w['title'].startswith('iCDB Project Backup')]
output = main[0].get('output') if len(main) == 1 else None
if not isinstance(output, str) or not output.strip():
return {'status': 'UNCONFIRMED', 'detail': '无法确认备份/恢复/修复输出'}
active = list(re.finditer(r'(?i)repairing|restoring|backing up|creating (?:a )?backup', output))
if active and max(output.rfind('Backup information loaded correctly.'),
output.rfind('Repair project error [')) < active[-1].start():
return {'status': 'ACTIVE', 'detail': '原生备份/恢复/修复尚未确认结束', 'output': output}
return {'status': 'IDLE', 'detail': '未观察到进行中的原生操作'}
@contextmanager
def _process_handle(pid, *, terminate=False):
import win32api, win32con
handle = win32api.OpenProcess(win32con.SYNCHRONIZE | 0x1000 | (1 if terminate else 0), False, int(pid))
try:
yield handle
finally:
handle.Close()
def _handle_identity(handle):
import ctypes
from ctypes import wintypes
import win32process
kernel = ctypes.WinDLL('kernel32', use_last_error=True)
kernel.QueryFullProcessImageNameW.argtypes = [wintypes.HANDLE, wintypes.DWORD,
wintypes.LPWSTR, ctypes.POINTER(wintypes.DWORD)]
kernel.QueryFullProcessImageNameW.restype = wintypes.BOOL
buffer = ctypes.create_unicode_buffer(32768)
length = wintypes.DWORD(len(buffer))
if not kernel.QueryFullProcessImageNameW(int(handle), 0, buffer, ctypes.byref(length)):
raise ctypes.WinError(ctypes.get_last_error())
return {'created_handle': win32process.GetProcessTimes(handle)['CreationTime'].isoformat(),
'image': buffer.value}
def _process_identity(row):
with _process_handle(row['pid']) as handle:
identity = _handle_identity(handle)
try:
identity.update(_force_ownership(handle, row['pid']))
except Exception as error:
identity.update(force_user_confirmed=False, owner_error=str(error))
return identity
def _force_ownership(handle, pid):
import win32api, win32con, win32process, win32security, win32ts
if win32process.GetProcessId(handle) != pid:
raise ValueError('进程身份已变化')
def owner(process):
token = win32security.OpenProcessToken(process, win32con.TOKEN_QUERY)
try:
return win32security.ConvertSidToStringSid(
win32security.GetTokenInformation(token, win32security.TokenUser)[0])
finally:
token.Close()
sid = owner(handle)
session = win32ts.ProcessIdToSessionId(pid)
return {'owner_sid': sid, 'session_id': session, 'force_user_confirmed':
sid == owner(win32api.GetCurrentProcess())
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 _process_windows(pids):
result = _WindowSnapshot(pids)
if not pids: return result
import win32api, win32con, win32gui, win32process, win32service
from .native_repair_ui import _native_output
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):
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)
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))})
win32api.SetLastError(0)
win32gui.EnumChildWindows(hwnd, child, None)
window = {'hwnd': int(hwnd), 'title': win32gui.GetWindowText(hwnd),
'desktop': desktop_name,
'class': win32gui.GetClassName(hwnd), 'enabled': bool(win32gui.IsWindowEnabled(hwnd)),
'children': children, 'documents': documents, 'rect': list(win32gui.GetWindowRect(hwnd))}
if any(c['class'].casefold().startswith('richedit') for c in children):
window['output'] = _native_output([window])
result[pid].append(window)
try:
threads = _process_threads(pids)
except Exception as error:
result.incomplete = {pid: str(error)[:500] for pid in pids}
return result
desktops = {}
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:
result.incomplete.setdefault(pid, str(error)[:500])
if not any(pid in members for members in desktops.values()):
result.incomplete.setdefault(pid, '窗口所属桌面暂时无法确认')
# EnumThreadWindows silently omits windows on other desktops. Enumerate
# only desktops actually assigned to the target processes' threads.
for name, members in desktops.items():
desktop = None
try:
desktop = win32service.OpenDesktop(name, 0, False, win32con.DESKTOP_READOBJECTS)
win32api.SetLastError(0)
for hwnd in desktop.EnumDesktopWindows():
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])
finally:
if desktop is not None:
desktop.CloseDesktop()
return result
def _project_name(row, library):
from .failed_session import _command_args
for arg in _command_args(row['command'])[1:]:
try:
relative = Path(arg.split('=', 1)[-1]).relative_to(library.parent/'ReusableBlocksLP')
if len(relative.parts) >= 2 and relative.parts[1].casefold() == 'work':
return relative.parts[0]
except ValueError:
continue
return '当前库关联会话'
def close_target(name, windows, *, incomplete=None):
"""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')
or name.casefold() == 'expeditionpcb.exe' and 'Expedition PCB' in w['title'])]
if len(main) != 1:
return None, '未确认空闲主窗口;有工程时请先在原生窗口保存并关闭'
window = main[0]
for other in windows:
if other is window: continue
benign = (not other['title'] and other['class'] in
('UAC_InputIndicatorOverlayWnd', 'UAC Input Indicator'))
benign = benign or (other['class'] == 'Internet Explorer_Hidden' and not other['title']
and not other.get('children') and other.get('rect', [1, 1, 2, 2])[0:2] == other.get('rect', [1, 1, 2, 2])[2:4])
if not benign: return None, '存在原生弹窗,请先处理该窗口后重新检查'
if not window['enabled']:
return None, '原生程序正在工作,请稍后重新检查'
if any(c['class'].casefold() == 'msctls_progress32' for c in window['children']):
return None, '原生操作尚未结束'
if name.casefold() == 'icdbprojectbackup.exe':
output = window.get('output')
if not isinstance(output, str): return None, '原生输出尚无法确认,请重新检查'
active = list(re.finditer(r'(?i)repairing|restoring|backing up|creating (?:a )?backup', output))
last_load = output.rfind('Backup information loaded correctly.')
failure = output.rfind('Repair project error [')
if active and max(last_load, failure) < active[-1].start():
return None, '备份、恢复或修复需要在原生窗口确认结束后再释放'
return window, ('将正常关闭工程;未保存时等待确认' if window.get('documents') else '可正常关闭')
def _save_question(windows, *, incomplete=None):
if incomplete:
return None
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']}
if (window['class'] == '#32770' and 'Expedition' in window['title']
and re.search(r'\bsave\b', text, re.I) and re.search(r'changes|modified', text, re.I)
and set(buttons) == {6, 7, 2}):
return {'hwnd': window['hwnd'], 'text': text, 'buttons': buttons,
'desktop': window.get('desktop', '')}
return None
def _cancel_question(name, windows, *, incomplete=None):
if (name.casefold() != 'icdbprojectbackup.exe'
or native_activity(name, windows, incomplete=incomplete)['status'] != 'ACTIVE'):
return None
candidates = []
for window in windows:
if not (window['class'].startswith('Afx:') or window['class'] == '#32770'):
continue
if not window['title'].startswith('iCDB Project Backup') or not window['enabled']:
continue
for button in window['children']:
if (button['class'] == 'Button' and button.get('id') == 2 and button.get('enabled')
and button.get('text', '').replace('&', '').strip() in ('Cancel', '取消')):
candidates.append({'hwnd': window['hwnd'], 'button': button,
'title': window['title'],
'desktop': window.get('desktop', '')})
return candidates[0] if len(candidates) == 1 else None
def inspect_residual_sessions(library, *, block_names=()):
from .library_lock import _owner_matches_scope, blocker_path, checkpoint_record, has_retained_library
library = Path(library).resolve()
if library.suffix.casefold() != '.lmc':
raise ValueError('请选择中心库 .lmc 文件')
if not library.is_file():
raise ValueError('中心库路径当前不可见,请检查文件是否存在及网络盘映射后重新检查')
blocks = tuple(dict.fromkeys(str(name) for name in block_names))
if any(not name or name in ('.', '..') or any(c in name for c in '\\/:*?"<>|') for name in blocks):
raise ValueError('残留检查的工程名称无效')
roots = tuple(library.parent/'ReusableBlocksLP'/b/'Work' for b in blocks) + (library.parent/'SymbolLibs',)
if not blocks: roots = (library.parent,)
candidates = []
for row in query_process_snapshot():
if row['pid'] == os.getpid(): continue
native = row['name'].casefold() in _NAMES
worker = (row['name'].casefold() in _WORKER_NAMES
and any(flag in row['command'].casefold() for flag in _WORKER_FLAGS))
if not (native or worker): continue
scope = _owner_matches_scope(row, library, roots)
if scope is not False:
candidates.append({**row, 'scope_confirmed': scope is True})
windows = _process_windows({r['pid'] for r in candidates})
sessions = []
for row in candidates:
item = dict(row)
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, '归属未确认,请在原生窗口确认工程并关闭后重新检查')
item.update(can_close=target is not None, detail=detail)
except Exception as identity_error:
item.update(can_close=False, detail=f'进程已变化或暂时无法确认:{identity_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
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)
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'] += ';窗口在后台,可查看原生提示并使用已提供的保存/取消操作'
item['force_block_reason'] = force_block_reason(item)
item['force_allowed'] = not item['force_block_reason']
if item['force_block_reason']:
item['detail'] += ';'+item['force_block_reason']
sessions.append(item)
previous = []
marker = blocker_path(library)
for path in (marker, marker.with_suffix('.pending')):
if path.exists():
record = checkpoint_record(path)
previous.append({'path': str(path), 'recognized': record is not None,
'status': record.get('status', 'UNRECOGNIZED') if record else 'UNRECOGNIZED',
'time': record.get('time', '') if record else '',
'pid': record.get('pid') if record else None})
if has_retained_library(library):
previous.append({'path': str(library), 'status': 'RETAINED_IN_MEMORY', 'time': '',
'pid': os.getpid(), 'kind': 'in_memory'})
return {'library': str(library), 'block_names': list(blocks), 'sessions': sessions,
'previous_records': previous}
def _request_close(row, *, stop=None):
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 row['name'].casefold() == 'expeditionpcb.exe':
from .failed_session import _startup_snapshot, _cancel_target
for window in windows:
if window['class'] != '#32770': continue
target = _cancel_target(_startup_snapshot(window['hwnd'], row['pid']))
if target:
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
if close_target(row['name'], windows)[0] is not None: break
break
target, detail = close_target(row['name'], windows, incomplete=error)
if target is None: return {'release_status': 'WAITING', 'detail': detail}
if stop is not None and stop.is_set():
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
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:
return {'release_status': 'RELEASED', 'detail': '已正常退出'}
if stop is not None and stop.is_set(): break
return {'release_status': 'WAITING', 'detail': '已请求正常关闭;请处理原生窗口,完成后重新检查'}
def _force_close(row, *, stop=None):
"""Separate UI consent permits ending only this exact, scoped process handle."""
import win32api, win32con, win32event
if stop is not None and stop.is_set():
return {'release_status': 'CANCELLED', 'detail': '已停止释放'}
if reason := force_block_reason(row):
return {'release_status': 'WAITING', 'detail': reason}
with _process_handle(row['pid'], terminate=True) as handle:
if win32event.WaitForSingleObject(handle, 0) == win32con.WAIT_OBJECT_0:
return {'release_status': 'RELEASED', 'detail': '已退出'}
if _handle_identity(handle) != {k: row.get(k) for k in ('created_handle', 'image')}:
return {'release_status': 'IDENTITY_CHANGED', 'detail': '进程身份已变化,未结束'}
ownership = _force_ownership(handle, row['pid'])
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']))
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():
return {'release_status': 'CANCELLED', 'detail': '已停止释放,未强制结束'}
win32api.TerminateProcess(handle, 1)
exited = win32event.WaitForSingleObject(handle, 3000) == win32con.WAIT_OBJECT_0
return {'release_status': 'RELEASED' if exited else 'WAITING',
'detail': '已强制结束客户端,工程待检查,未执行修复' if exited else '已请求结束客户端,等待退出'}
def _finish_library_release(library, evidence):
from .library_lock import release_retained_library
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, 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)
if fresh is None or any(fresh.get(k) != row.get(k) for k in ('created', 'command', 'executable', 'name')):
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('取消目标身份已变化,请重新检查')
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']))
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': '已停止,未请求原生取消'}
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', [])}
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_residual_sessions(plan, evidence_dir, *, stop=None, force=False, cancel_native=False):
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):
raise ValueError('释放记录需位于中心库之外')
root.mkdir(parents=True)
result = {'status': 'PARTIAL', 'library': str(library), 'sessions': [
{**row, 'release_status': 'NOT_STARTED', 'detail': '尚未执行',
'consent_allowed': not force_block_reason(row) if force else row.get('scope_confirmed') is True}
for row in plan['sessions']], 'force': force, 'cancel_native': cancel_native,
'evidence_path': str(root/'result.json'), 'previous_records': plan.get('previous_records', [])}
def save():
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']]})
return True
except OSError as error:
result.update(status='PARTIAL', report_saved=False, evidence_error=str(error))
return False
if not save():
return result # No native actions without the initial checkpoint.
if force or cancel_native:
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),
'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:
with consent_path.open('x', encoding='utf-8') as stream:
json.dump(consent, stream, ensure_ascii=False, indent=2)
stream.flush(); os.fsync(stream.fileno())
except OSError as error:
result['detail'] = f'确认记录保存失败,未执行:{error}'
save()
raise
result['consent_path'] = str(consent_path)
try:
fresh = {r['pid']: r for r in query_process_snapshot()}
blocks = plan.get('block_names', ())
roots = (tuple(library.parent/'ReusableBlocksLP'/b/'Work' for b in blocks)
+ (library.parent/'SymbolLibs',)) if blocks else (library.parent,)
# Close native children first; keep output rows in the original preview order.
ordered = sorted(result['sessions'], key=lambda r: r['name'].casefold() in _WORKER_NAMES)
for row in ordered:
current = fresh.get(row['pid'])
outcome = {'release_status': 'RELEASED', 'detail': '已退出'}
if stop is not None and stop.is_set():
outcome = {'release_status': 'CANCELLED', 'detail': '已停止释放'}
elif current is not None:
from .library_lock import _owner_matches_scope
scoped = _owner_matches_scope(current, library, roots) is True
if row.get('scope_confirmed') is not True or not scoped or row['pid'] == os.getpid():
outcome = {'release_status': 'WAITING', 'detail': '未在确认名单中证明属于当前库,未关闭;请重新检查'}
elif not row.get('created') or any(current.get(key) != row.get(key)
for key in ('created', 'executable', 'command', 'name')):
outcome = {'release_status': 'IDENTITY_CHANGED', 'detail': '确认后进程身份已变化,未关闭'}
elif force and (reason := force_block_reason(row)):
outcome = {'release_status': 'WAITING', 'detail': reason, 'force_allowed': False}
else:
row.update(release_status='REQUESTING', detail='正在请求原生操作,结果待确认')
if not save():
return result
try:
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:
outcome = {'release_status': 'WAITING', 'detail': str(error)}
row.update(outcome)
if not save():
return result # Preserve completed facts; stop further actions on storage failure.
after = {r['pid']: r for r in query_process_snapshot()}
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']:
if row['release_status'] == 'WAITING' and row['pid'] not in after:
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)
if row.get('force_user_confirmed') is True else None),
native_activity=native_activity(row['name'], windows, incomplete=error))
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'
except BaseException as error:
result.update(status='PARTIAL', detail=f'{type(error).__name__}: {error}')
if not isinstance(error, Exception):
raise
finally:
save()
return result
def release_residual_sessions(plan, evidence_dir, *, stop=None, force=False, cancel_native=False):
import win32con, win32event
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
acquired = False
try:
deadline = time.monotonic()+15
while time.monotonic() < deadline and not (stop and stop.is_set()):
acquired = win32event.WaitForSingleObject(mutex, 0) in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
if acquired: break
time.sleep(.2)
if not acquired:
return {'status': 'PARTIAL', 'library': plan['library'], 'sessions': [
{**r, 'release_status': 'WAITING', 'detail': '其它批次尚在执行;请停止该批次后重试'}
for r in plan['sessions']], 'detail': '未取得执行通道,未关闭任何进程。'}
return _release_residual_sessions(plan, evidence_dir, stop=stop, force=force, cancel_native=cancel_native)
finally:
if acquired: win32event.ReleaseMutex(mutex)
mutex.Close()
def answer_save_question(row, choice):
"""Only the exact displayed save question receives an explicit user answer."""
import win32con, win32event, win32gui
if choice not in (6, 7, 2): raise ValueError('无效的保存选择')
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
acquired = win32event.WaitForSingleObject(mutex, 0) in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
if not acquired:
mutex.Close()
raise ValueError('其它批次正在执行,请稍后处理保存提示')
try:
_answer_save_question(row, choice)
finally:
win32event.ReleaseMutex(mutex)
mutex.Close()
def _answer_save_question(row, choice):
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']))
if not prompt or prompt != row.get('prompt'):
raise ValueError('原生提示已变化,请重新检查')
button = prompt['buttons'][choice]
import win32process
if win32process.GetWindowThreadProcessId(button['hwnd'])[1] != row['pid']:
raise ValueError('保存按钮归属已变化')
win32gui.PostMessage(button['hwnd'], win32con.BM_CLICK, 0, 0)
-5
View File
@@ -58,11 +58,6 @@ class RunTimings:
elif stage == 'identity_verified':
self.end('pcb_startup', now)
self.begin('integration', now)
elif stage == 'diagnostic_native_loaded_candidate':
self.end('pcb_startup', now)
self.begin('diagnostic_close', now)
elif stage == 'diagnostic_complete':
self.end('diagnostic_close', now)
elif stage == 'integration_action':
key = ACTION_KEYS.get(event.get('action'))
if key:
+11 -59
View File
@@ -15,15 +15,6 @@ import stat
MANIFEST_VERSION = 1
MANIFEST_RULE_VERSION = 1
_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',)
_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:
@@ -310,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
@@ -371,15 +329,9 @@ 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):
@@ -1,6 +1,5 @@
"""Small, asynchronous entry point for recovery from a healthy CBB project."""
from pathlib import Path
from threading import Event
from PySide6.QtCore import QObject, QThreadPool, Signal
from PySide6.QtWidgets import (QComboBox, QDialog, QFileDialog, QFormLayout,
@@ -24,8 +23,6 @@ class BackupRecoveryDialog(QDialog):
self.resize(620, 230)
self.request_factory = request_factory
self.recoverer = recoverer
self.native_queue = None
self.stop = Event()
self.busy = False
self.pool = QThreadPool(self)
self.pool.setMaxThreadCount(1)
@@ -41,9 +38,6 @@ class BackupRecoveryDialog(QDialog):
self.restore_button.clicked.connect(self._restore)
self.close_button = QPushButton('关闭')
self.close_button.clicked.connect(self.reject)
self.cancel_queue_button = QPushButton('取消排队')
self.cancel_queue_button.setEnabled(False)
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)
@@ -56,7 +50,6 @@ class BackupRecoveryDialog(QDialog):
buttons = QHBoxLayout()
buttons.addStretch()
buttons.addWidget(self.restore_button)
buttons.addWidget(self.cancel_queue_button)
buttons.addWidget(self.close_button)
layout.addRow(buttons)
@@ -91,24 +84,11 @@ class BackupRecoveryDialog(QDialog):
QMessageBox.Yes | QMessageBox.No, QMessageBox.No) != QMessageBox.Yes:
return
self.busy = True
self.stop.clear()
self._set_enabled(False)
self.status_label.setText('正在准备恢复…')
self.started.emit(name)
def execute():
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.signals.progress.emit({'stage': 'queue_acquired'})
return action()
try:
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 ..verify_runner import VerifyResult
return VerifyResult('CANCELLED', stderr=str(error))
self.worker = ServiceWorker(execute)
self.worker = ServiceWorker(lambda: recoverer(
request, source, progress=self.signals.progress.emit))
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)
@@ -121,8 +101,6 @@ class BackupRecoveryDialog(QDialog):
def _progress(self, event):
if isinstance(event, dict):
if event.get('stage') in ('waiting_native_slot', 'queue_acquired'):
self.cancel_queue_button.setEnabled(event['stage'] == 'waiting_native_slot')
message = event.get('message') or event.get('detail')
if message:
self.status_label.setText(str(message))
@@ -143,7 +121,6 @@ class BackupRecoveryDialog(QDialog):
def _finished(self):
self.busy = False
self.cancel_queue_button.setEnabled(False)
self._set_enabled(True)
def reject(self):
@@ -1,115 +0,0 @@
"""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
from ..verify_runner import VerifyResult, run_verify, write_batch_report
from ..icdb_maintenance import write_maintenance_report
class IcdbCheckTask(QObject):
event = Signal(object)
item_done = Signal(str, object)
finished = Signal(object)
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.verifier = verifier or (lambda req: run_verify(req, progress=self.event.emit, stop=self.stop))
self.results = []
self.stop = Event()
self.active = False
self.paused = False
self.invalidated = set()
self.ready_names = set()
self.running = False
self.report = None
self.report_error = ''
self.pool = QThreadPool(self); self.pool.setMaxThreadCount(1)
def start(self):
self.active = True
self._next()
def cancel(self):
self.stop.set(); self.queue.wake()
if not self.running and self.active: self._next()
def pause(self):
self.paused = True
def invalidate(self, names):
self.invalidated.update(names)
def update_statuses(self, statuses):
self.ready_names = (self.ready_names - statuses.keys()) | {
name for name, status in statuses.items() if status == 'READY'}
def resume(self):
self.paused = False; self.queue.wake()
if not self.running and self.active: self._next()
def _next(self):
if self.running or not self.active: return
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):])
if len(self.results) == len(self.requests):
self._report(); return
if self.paused: return
request = self.requests[len(self.results)]
def check():
try:
def execute():
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.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:
return VerifyResult('CANCELLED', stderr=str(error))
except Exception as error:
return VerifyResult('FAIL', stderr=str(error), safe_to_continue=False,
error_category='ICDB_INSPECTION_UNCONFIRMED')
self.running = True
self.worker = ServiceWorker(check)
self.worker.signals.succeeded.connect(self._record)
self.worker.signals.finished.connect(self._item_finished)
self.pool.start(self.worker)
def _record(self, result):
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)
def _item_finished(self):
self.running = False
self._next()
def _report(self):
self.running = True
def write():
try:
report = write_batch_report(self.requests, self.results, self.report_root)
write_maintenance_report(self.requests, self.results, report, ())
return report, ''
except Exception as error:
return None, str(error)
self.worker = ServiceWorker(write)
self.worker.signals.succeeded.connect(self._report_ready)
self.worker.signals.finished.connect(self._complete)
self.pool.start(self.worker)
def _report_ready(self, payload):
self.report, self.report_error = payload
def _complete(self):
self.running = self.active = False
self.finished.emit(self)
File diff suppressed because it is too large. Load diff
+3 -33
View File
@@ -14,7 +14,7 @@ from ..management import run_management_batch, validate_name
RESULT_LABELS = {
'REMOVED': '已移除', 'UPLOADED': '已上传 / 未自动校验',
'UPLOADED_VERIFIED': '已上传且校验通过', 'UPLOADED_VERIFY_FAILED': '已上传但校验未通过',
'UPLOAD_FAILED': '上传失败', 'RECOVERY_REQUIRED': '需要人工恢复',
'UPLOAD_FAILED': '上传失败', 'RECOVERY_REQUIRED': '需要人工恢复 / 队列已停止',
'BLOCKED': '操作被阻止', 'UNSUPPORTED': '当前环境不支持',
}
STAGE_LABELS = {
@@ -25,9 +25,6 @@ STAGE_LABELS = {
'verify': '正在校验上传结果', 'verified': '校验已返回', 'copy': '正在准备来源副本',
'hash': '正在校验主要文件',
'release_check': '正在检查工程是否被占用',
'previous_release_check': '正在复核历史占用',
'previous_release_confirmed': '历史会话已确认释放',
'previous_release_unconfirmed': '占用复核未通过',
}
@@ -37,7 +34,6 @@ class ManagementSignals(QObject):
class ManagementDialog(QDialog):
completed = Signal(object)
before_execute = Signal(object)
def __init__(self, requests, parent=None, *, adapter=None, runner=None, recovery_from=None):
super().__init__(parent)
@@ -45,7 +41,6 @@ class ManagementDialog(QDialog):
self.template = self.templates[0]
self.operation = self.template.operation
self.adapter = adapter
self.native_queue = None
self.recovery_from = dict(recovery_from or {})
self.runner = runner or run_management_batch
if self.recovery_from and runner is None:
@@ -165,20 +160,8 @@ class ManagementDialog(QDialog):
return
self.busy = True; self.executed = True
self._enabled(False)
self.before_execute.emit([r.name for r in requests])
def execute():
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
try:
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 ..management import ManagementResult
return [ManagementResult(r.operation, r.library, r.name, r.partition, r.source, r.auto_verify,
'complete', 'BLOCKED', True, str(error)) for r in requests]
self.worker = ServiceWorker(execute)
self.worker = ServiceWorker(lambda: self.runner(requests, adapter=self.adapter, stop=self.stop,
progress=self.signals.progress.emit))
self.worker.signals.succeeded.connect(self._result)
self.worker.signals.failed.connect(self._failed)
self.worker.signals.finished.connect(self._finished)
@@ -193,7 +176,6 @@ class ManagementDialog(QDialog):
def _progress(self, event):
stage = str(event.get('stage', ''))
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))
if 'copied_files' in event:
text += f' {event["copied_files"]}/{event.get("total_files", "?")}'
@@ -206,18 +188,6 @@ class ManagementDialog(QDialog):
for result in results:
summary = f'{result.name}:{RESULT_LABELS.get(result.status, result.status)}'
text = f'{summary} — {result.detail}'
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"])};范围仅限报告列出的工程文件。')
else:
summary += ',变更清单待核对'
text += '\n'+changes.get('detail', '变更清单未确认')
if getattr(result, 'release_proof', None):
text += '\n历史会话已释放;历史工程数据的恢复状态需另行核对。'
if not result.safe_to_continue:
summary += ',原生会话释放待确认'
if self.recovery_from and result.status == 'UPLOADED_VERIFIED':
summary += ',版本待核对。'
elif result.status not in ('UPLOADED', 'UPLOADED_VERIFIED', 'REMOVED'):
@@ -1,254 +0,0 @@
"""User-confirmed, asynchronous native-session release."""
from pathlib import Path
from threading import Event
from PySide6.QtCore import QThreadPool, Signal
from PySide6.QtWidgets import (QDialog, QVBoxLayout, QHBoxLayout, QLabel, QPushButton,
QTableWidget, QTableWidgetItem, QHeaderView, QMessageBox)
from .workers import ServiceWorker
from ..residual_sessions import force_block_reason
class ResidualReleaseDialog(QDialog):
released = Signal(object)
before_release = Signal()
def __init__(self, library, evidence_dir, parent=None):
super().__init__(parent)
self.library, self.evidence_dir = Path(library), Path(evidence_dir)
self.plan = None
self.native_queue = None
self.busy = False
self.stop = Event()
self._refresh_after = False
self.pool = QThreadPool(self)
self.setWindowTitle('释放残留会话')
self.setModal(True)
self.resize(1040, 400)
layout = QVBoxLayout(self)
self.message = QLabel('正在检查当前库关联的会话…')
self.message.setWordWrap(True)
layout.addWidget(self.message)
self.table = QTableWidget(0, 8)
self.table.setHorizontalHeaderLabels(['工程', '程序', 'PID', '状态', '窗口位置', '程序路径', '确认范围', '执行结果'])
self.table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeToContents)
self.table.horizontalHeader().setSectionResizeMode(3, QHeaderView.Stretch)
self.table.setEditTriggers(QTableWidget.NoEditTriggers)
layout.addWidget(self.table)
buttons = QHBoxLayout()
self.refresh_button = QPushButton('重新检查')
self.confirm_button = QPushButton('确认释放')
self.prompt_button = QPushButton('处理保存提示…')
self.details_button = QPushButton('查看原生提示…')
self.cancel_native_button = QPushButton('请求原生取消…')
self.force_button = QPushButton('强制结束客户端…')
self.force_button.setEnabled(False)
self.prompt_button.setEnabled(False)
self.close_button = QPushButton('关闭')
for button in (self.refresh_button, self.confirm_button, self.details_button, self.prompt_button,
self.cancel_native_button, self.force_button, self.close_button): buttons.addWidget(button)
layout.addLayout(buttons)
self.refresh_button.clicked.connect(self.refresh)
self.confirm_button.clicked.connect(self.confirm_release)
self.close_button.clicked.connect(self.close)
self.prompt_button.clicked.connect(self.answer_prompt)
self.force_button.clicked.connect(self.force_release)
self.details_button.clicked.connect(self.show_native_details)
self.cancel_native_button.clicked.connect(self.cancel_native)
self.table.itemSelectionChanged.connect(self._update_prompt)
self.refresh()
def _start(self, action, completed):
self.busy = True
self.confirm_button.setEnabled(False)
self.refresh_button.setEnabled(False)
self.prompt_button.setEnabled(False)
self.force_button.setEnabled(False)
self.cancel_native_button.setEnabled(False)
self.close_button.setText('停止释放')
self.worker = ServiceWorker(action)
self.worker.signals.succeeded.connect(completed)
self.worker.signals.failed.connect(lambda error: self.message.setText(str(error)))
self.worker.signals.finished.connect(self._finished)
self.pool.start(self.worker)
def _finished(self):
self.busy = False
self.refresh_button.setEnabled(True)
self.confirm_button.setEnabled(self.plan is not None)
self.force_button.setEnabled(bool(self.plan and any(
not force_block_reason(r) for r in self.plan['sessions'])))
self.close_button.setText('关闭')
self._update_prompt()
if self._refresh_after:
self._refresh_after = False
self.refresh()
def _rows(self, sessions):
self.table.setRowCount(len(sessions))
for index, session in enumerate(sessions):
allowed = session.get('consent_allowed')
permission = '允许' if allowed is True else '未允许' if allowed is False else '待确认'
outcome = {'RELEASED': '已释放', 'WAITING': '未释放', 'IDENTITY_CHANGED': '身份已变化',
'CANCELLED': '已停止', 'REQUESTING': '执行中', 'NOT_STARTED': '尚未执行'}.get(
session.get('release_status'), '待执行')
for column, value in enumerate((session.get('project', ''), session['name'],
session['pid'], session.get('detail', ''), ', '.join(session.get('desktops', [])),
session.get('image', session.get('executable', '')), permission, outcome)):
self.table.setItem(index, column, QTableWidgetItem(str(value)))
if sessions: self.table.setCurrentCell(0, 0)
def _update_prompt(self):
row = self.table.currentRow()
rows = self.plan['sessions'] if self.plan else []
self.prompt_button.setEnabled(not self.busy and 0 <= row < len(rows) and bool(rows[row].get('prompt')))
self.cancel_native_button.setEnabled(not self.busy and 0 <= row < len(rows)
and bool(rows[row].get('cancel_prompt')))
self.details_button.setEnabled(0 <= row < len(rows))
def show_native_details(self):
if not self.plan: return
row = self.table.currentRow()
if row < 0: return
session = self.plan['sessions'][row]
box = QMessageBox(self); self.native_details = box
box.setWindowTitle('原生会话状态')
box.setText(f'{session["name"]} (PID {session["pid"]})\n'+session.get('detail', ''))
details = ['程序路径:'+session.get('image', session.get('executable', '')),
'窗口位置:'+', '.join(session.get('desktops', [])),
session.get('native_activity', {}).get('detail', '')]
for window in session.get('windows', []):
details.extend(['', window.get('title', ''), window.get('output', '') or ''])
details.extend(c.get('text', '') for c in window.get('children', [])
if c.get('class') == 'Static')
box.setDetailedText('\n'.join(details))
box.show()
def cancel_native(self):
if self.busy or not self.plan: return
row = self.table.currentRow()
if row < 0: return
session = self.plan['sessions'][row]
if not session.get('cancel_prompt'): return
answer = QMessageBox.question(self, '请求原生取消',
f'请求 {session["name"]} (PID {session["pid"]}) 当前显示的取消按钮?\n'
'取消后的工程状态仍需核对;不会强制结束进程。',
QMessageBox.Yes | QMessageBox.No, QMessageBox.No)
if answer != QMessageBox.Yes: return
from cbb_refresh_verify.residual_sessions import request_native_cancel
self.before_release.emit(); self.stop.clear()
def execute():
action = lambda: request_native_cancel(session, self.library, self.evidence_dir, stop=self.stop)
return self.native_queue.run(action, stop=self.stop) if self.native_queue is not None else action()
def done(result):
self.message.setText(result.get('detail') or '\n'.join(r.get('detail', '') for r in result['sessions']))
confirmed = self._accept_release_proof(result)
if confirmed:
self.message.setText('已确认原生会话结束,当前库已释放。')
if result.get('evidence_error'):
self.message.setText(self.message.text()+'\n记录保存失败:'+result['evidence_error'])
elif not confirmed:
self._refresh_after = True
self._start(execute, done)
def _accept_release_proof(self, result):
proof = result.get('proof', {})
# Both paths were canonicalized by the worker; GUI comparison must not touch SMB.
if (proof.get('status') != 'RELEASE_CONFIRMED'
or Path(proof.get('library', '')).absolute() != self.library.absolute()
or any(r.get('release_status') != 'RELEASED' for r in result['sessions'])):
return False
self.plan = None
self.released.emit(proof)
return True
def answer_prompt(self):
if self.busy or not self.plan: return
row = self.table.currentRow()
if row < 0: return
session = self.plan['sessions'][row]
prompt = session.get('prompt')
if not prompt: return
choice = QMessageBox.question(self, '关闭工程前保存', prompt['text']+
'\n\n是:保存后关闭;否:放弃未保存更改;取消:保留会话。',
QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel, QMessageBox.Cancel)
code = {QMessageBox.Yes: 6, QMessageBox.No: 7, QMessageBox.Cancel: 2}[choice]
from cbb_refresh_verify.residual_sessions import answer_save_question
self._start(lambda: answer_save_question(session, code),
lambda _: setattr(self, '_refresh_after', True))
def refresh(self):
if self.busy: return
from cbb_refresh_verify.library_lock import inspect_residual_sessions
self.plan = None
self.message.setText('正在检查当前库关联的会话…')
def ready(plan):
self.library = Path(plan['library'])
self.plan = plan
self._rows(plan['sessions'])
text = ('确认后逐项正常关闭下列会话;有未保存更改时,可选择保存或保留。'
if plan['sessions'] else '未发现活跃会话。')
records = plan.get('previous_records', [])
if records:
dates = ', '.join(sorted({r['time'][:10] for r in records if r.get('time')}))
text += f'\n有 {len(records)} 条历史操作记录'+(f'({dates})' if dates else '')+',确认后将复核并清理。'
elif not plan['sessions']:
text += '确认后将复查库占用状态。'
self.message.setText(text)
def inspect():
from cbb_refresh_verify.network_path import select_library_file
library = self.library if self.library.suffix.casefold() == '.lmc' else select_library_file(self.library)
return inspect_residual_sessions(library)
self._start(inspect, ready)
def force_release(self):
if self.busy or not self.plan or not self.plan['sessions']: return
targets = [r for r in self.plan['sessions'] if not force_block_reason(r)]
if not targets: return
names = '\n'.join(f'{r.get("project", "")} — {r["name"]} (PID {r["pid"]})' for r in targets)
answer = QMessageBox.warning(self, '强制结束客户端',
'仅强制结束以下客户端。客户端中其他已打开工程也会退出;未保存的更改会丢失,正在写入的工程可能需要恢复。'
'\n数据库服务器和归属未知的进程不会被强制结束。\n\n'+names+
'\n\n仍要结束这些进程吗?', QMessageBox.Yes | QMessageBox.Cancel, QMessageBox.Cancel)
if answer == QMessageBox.Yes: self.confirm_release(force=True)
def confirm_release(self, checked=False, *, force=False):
if self.busy or self.plan is None: return
from cbb_refresh_verify.library_lock import release_residual_sessions
self.stop.clear()
plan = self.plan
self.before_release.emit()
self.message.setText('正在逐项释放,请稍候…')
def done(result):
self.plan = {**plan, 'sessions': result['sessions']}
self._rows(result['sessions'])
count = sum(row['release_status'] == 'RELEASED' for row in result['sessions'])
if self._accept_release_proof(result):
self.message.setText(f'已释放 {count} 个会话,旧占用记录已解除。'
+ ('\n记录保存失败:'+result['evidence_error'] if result.get('evidence_error') else ''))
else:
self.message.setText(f'已释放 {count} 个会话,其余会话或库状态仍待确认。'
+ ('\n'+result['detail'] if result.get('detail') else '可查看原生提示、处理保存或请求取消后重新检查。')
+ ('\n记录保存失败:'+result['evidence_error'] if result.get('evidence_error') else ''))
allowed = [row for row in result['sessions'] if row.get('consent_allowed') is True]
pending = sum(row.get('release_status') != 'RELEASED' for row in allowed)
self.message.setText(self.message.text()+f'\n确认允许 {len(allowed)} 项,其中未释放 {pending} 项。')
def execute():
action = lambda: release_residual_sessions(plan, self.evidence_dir, stop=self.stop, force=force)
return self.native_queue.run(action, stop=self.stop) if self.native_queue is not None else action()
self._start(execute, done)
def closeEvent(self, event):
if self.busy:
self.stop.set()
self.message.setText('正在停止释放,等待本次操作返回…')
event.ignore()
else:
super().closeEvent(event)
def reject(self):
if self.busy:
self.stop.set()
else:
super().reject()
+1 -52
View File
@@ -7,7 +7,6 @@ once after cleanup if the worker was killed while a native file was open.
from pathlib import Path
import json
import os
import re
import stat
import tempfile
import subprocess
@@ -125,7 +124,7 @@ def collect_native_failure_logs(pcb_path, evidence_root, *, max_bytes=NATIVE_LOG
def _collect_icdb_recovery(source, evidence_root):
"""Only promote a native error whose log changed after this launch."""
from .icdb_recovery import read_log_failure, read_icdb_error
from .icdb_recovery import read_log_failure
root = Path(evidence_root)/'diagnostics'
try:
baseline = json.loads((root/'startup-log-baseline.json').read_text('utf-8'))
@@ -136,9 +135,6 @@ def _collect_icdb_recovery(source, evidence_root):
_, recovery = read_log_failure(source, checkpoint)
if recovery:
_write_record(root/'icdb-recovery.json', {**recovery, 'source': str(source)})
message = read_icdb_error(source, checkpoint)
if message:
_write_record(root/'icdb-error-content.json', {'native_message': message, 'source': str(source)})
except (OSError, ValueError, KeyError, TypeError):
pass # Unknown freshness must not replace the original failure.
@@ -147,56 +143,9 @@ def _collect_icdb_recovery(source, evidence_root):
def failure_logs_main(request_path):
job = json.loads(Path(request_path).read_text(encoding='utf-8'))
collect_native_failure_logs(job['pcb'], job['root'])
collect_native_client_error(job['root'])
return 0
def collect_native_client_error(evidence_root):
"""Read only this PCB PID's new iCDB manager log in the bounded log helper."""
root = Path(evidence_root)/'diagnostics'
try:
context = json.loads((root/'native-client-context.json').read_text('utf-8'))
pid, started = context['native_pid'], context['started_ns']
if type(pid) is not int or pid <= 0 or type(started) is not int:
return
target = str(context['database']).replace('/', '\\').casefold()
if not target:
return
from .icdb_recovery import decode_log
for directory in Path(context['client_log_root']).glob(f'*-{pid}'):
for source in directory.glob('*.iCDBManager.txt'):
with source.open('rb') as stream:
metadata = os.fstat(stream.fileno())
if (metadata.st_mtime_ns < started
or getattr(metadata, 'st_birthtime_ns', started) < started):
continue
header = stream.read(16*1024)
stream.seek(0, os.SEEK_END)
size = stream.tell()
stream.seek(max(0, size-NATIVE_LOG_MAX_BYTES))
tail = stream.read(NATIVE_LOG_MAX_BYTES)
if not re.search(rf'\bPID\s*\[{pid}\]', decode_log(header)):
continue
# The native iCDB logger supplies the domain; a pathname in a
# generic PCB error alone never establishes this identity.
lines = decode_log(tail).splitlines()
if size > NATIVE_LOG_MAX_BYTES:
lines = lines[1:] # The first bounded-tail line may start mid-message.
message = next((line for line in lines
if re.search(r'\bERROR\s*:', line, re.I)
and target in line.replace('/', '\\').casefold()), '')
if message:
target_file = root/'native-logs/current-icdb-manager.txt'
target_file.parent.mkdir(parents=True, exist_ok=True)
target_file.write_bytes(tail)
_write_record(root/'icdb-error-content.json', {'native_message': 'iCDB: '+message,
'source': str(source), 'native_pid': pid, 'started_ns': started,
'database': context['database'], 'evidence': str(target_file)})
return
except (OSError, ValueError, KeyError, TypeError):
pass # A missing/ambiguous native log must not replace the open failure.
def capture_failure_logs_with_timeout(request_path, *, timeout_seconds=8):
"""Post-cleanup retry in a killable helper, not a potentially stuck SMB thread."""
request_path = Path(request_path)
+36 -90
View File
@@ -14,7 +14,6 @@ native menu invocation happens on the worker's private desktop.
from dataclasses import asdict, dataclass, field, replace
from pathlib import Path
import json
import logging
import os
import platform
import re
@@ -33,22 +32,6 @@ ERROR_TEXT = re.compile(r'failed|error|cannot connect|bad data', re.IGNORECASE)
INVALID_NAME_CHARS = '\\/:*?"<>|'
def _notify_progress(callback, *args):
"""A failed observer cannot change native execution or release facts."""
if callback is not None:
try:
callback(*args)
except Exception:
logging.getLogger(__name__).warning('Progress notification failed', exc_info=True)
def _write_optional_evidence(path, value):
try:
path.write_text(json.dumps(value, ensure_ascii=False, default=str, indent=2), encoding='utf-8')
except OSError:
logging.getLogger(__name__).warning('Could not write diagnostic evidence %s', path, exc_info=True)
@dataclass(frozen=True)
class VerifyRequest:
lmc_file: Path
@@ -102,7 +85,6 @@ class VerifyResult:
timings_seconds: dict[str, float] = field(default_factory=dict)
incomplete_timing_phases: tuple[str, ...] = ()
recovery_attempts: tuple[dict, ...] = ()
release_proof: dict | None = None
def resolve_importer(mentor_bin: str | None = None) -> Path:
@@ -529,7 +511,7 @@ def _cleanup_session_processes(root, *, lm_pid, target_pid, pcb, pcb_baseline, l
except OSError:
pass
if progress:
_notify_progress(progress, event)
progress(event)
return cleanup_verify_processes(
lm_pid,
@@ -551,7 +533,6 @@ def run_verify(request, *, progress=None, flag_reader=None, process_runner=None,
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
acquired = False
library_lock = None
previous_release = None
release_confirmed = True
remaining_clients = ()
def clients_released():
@@ -564,23 +545,18 @@ def run_verify(request, *, progress=None, flag_reader=None, process_runner=None,
win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
if not acquired:
return VerifyResult('BLOCKED', stderr='已有 CBB 校验任务运行,请等待结束。',
safe_to_continue=True, error_category='NATIVE_CHANNEL_BUSY')
safe_to_continue=False)
if request.maintenance:
from .maintenance_entry import run_icdb_check
return run_icdb_check(request, progress=progress, stop=stop)
from .library_lock import LibraryLock, LibraryBusy, recheck_previous_release
import pywintypes
from .library_lock import LibraryLock, LibraryBusy
if Path(request.lmc_file).is_file():
try:
previous_release = recheck_previous_release(request.lmc_file,
Path(request.evidence_dir)/'previous-release', block_name=request.block_name, progress=progress)
library_lock = LibraryLock(request.lmc_file, checkpoint=False,
safe_to_release=clients_released)
library_lock.__enter__()
except LibraryBusy as error:
return VerifyResult('FAIL', stderr=str(error), error_category='LIBRARY_IN_USE')
except (OSError, ValueError, RuntimeError, pywintypes.error) as error:
return VerifyResult('FAIL', stderr=str(error), error_category='LIBRARY_ACCESS_FAILED')
release_confirmed = False
result = _run_verify_serialized(
request, progress=progress, flag_reader=flag_reader,
@@ -678,10 +654,6 @@ def run_verify(request, *, progress=None, flag_reader=None, process_runner=None,
if type(pid) is int and pid > 0)
except (OSError, ValueError, KeyError):
pass
if previous_release is not None:
result = replace(result, release_proof=previous_release)
if result.evidence_path:
_write_optional_evidence(result.evidence_path, {'block_name': request.block_name, **asdict(result)})
return result
finally:
try:
@@ -754,24 +726,23 @@ def _run_verify_serialized(request, *, progress=None, flag_reader=None, process_
error_stage=(result.error_stage or (unfinished[-1] if unfinished else 'execution')
if result.status not in {"PASS", "SKIPPED"} else ""))
if result.evidence_path:
_write_optional_evidence(result.evidence_path, {'block_name': request.block_name, **asdict(result)})
_write_optional_evidence(result.evidence_path.with_name('performance.json'), {
result.evidence_path.write_text(json.dumps(
{'block_name': request.block_name, **asdict(result)},
ensure_ascii=False, default=str, indent=2), encoding='utf-8')
result.evidence_path.with_name('performance.json').write_text(json.dumps({
'block_name': request.block_name, 'status': result.status,
'unit': 'seconds', 'timings_seconds': durations,
'incomplete_timing_phases': unfinished,
'clock': 'monotonic; save helper subphases: VBScript Timer (midnight adjusted)',
'notes': 'phase totals overlap action/call subphases; skipped phases are absent',
})
}, ensure_ascii=False, indent=2), encoding='utf-8')
if progress:
_notify_progress(progress, {'stage': 'performance', 'block': request.block_name,
progress({'stage': 'performance', 'block': request.block_name,
'timings_seconds': durations, 'incomplete_timing_phases': unfinished,
'detail': ' '.join(f'{key}={value:.3f}s' for key, value in durations.items())})
if request.logging_context:
try:
request.logging_context.logger.info('operation=cbb_verify block=%s status=%s flag=%s evidence=%s error=%s timings_seconds=%s',
request.block_name, result.status, result.library_flag, result.evidence_path, result.stderr, durations)
except Exception:
logging.getLogger(__name__).warning('Operation logging failed', exc_info=True)
request.logging_context.logger.info('operation=cbb_verify block=%s status=%s flag=%s evidence=%s error=%s timings_seconds=%s',
request.block_name, result.status, result.library_flag, result.evidence_path, result.stderr, durations)
return result
@@ -785,14 +756,12 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
not depend on the host's port reservations.
"""
root = Path(request.evidence_dir).resolve()/('verify-' + uuid4().hex[:12])
try:
root.mkdir(parents=True, exist_ok=False)
except OSError as error:
return VerifyResult('FAIL', stderr=f'无法创建操作记录目录:{error}')
root.mkdir(parents=True, exist_ok=False)
fingerprint = runtime_fingerprint(request.mentor_bin)
_write_optional_evidence(root/'runtime.json', fingerprint)
(root/'runtime.json').write_text(
json.dumps(fingerprint, ensure_ascii=False, indent=2), encoding='utf-8')
if progress:
_notify_progress(progress, {'stage': 'runtime_fingerprint', 'block': request.block_name,
progress({'stage': 'runtime_fingerprint', 'block': request.block_name,
**fingerprint})
result_path = root/'result.json'
runner = process_runner or (lambda command, timeout, cwd:
@@ -828,7 +797,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
return finish(VerifyResult('BLOCKED', stderr=str(error)))
command = build_content_check_command(request, executable)
if progress:
_notify_progress(progress, {'stage': 'content_check_start', 'block': request.block_name,
progress({'stage': 'content_check_start', 'block': request.block_name,
'detail': ' '.join(command)})
timing.begin('content_check')
try:
@@ -850,7 +819,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
stdout=stdout, report_path=report, content_check_exit_code=exit_code,
safe_to_continue=not timed_out))
if progress:
_notify_progress(progress, {'stage': 'content_check_done', 'block': request.block_name, 'status': 'PASS'})
progress({'stage': 'content_check_done', 'block': request.block_name, 'status': 'PASS'})
# Sampling cannot establish that the whole native port range is unusable.
from .mentor_adapter import icdb_ports_bindable
@@ -858,7 +827,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
ports_ok, ports_detail = check_ports()
if not ports_ok:
if progress:
_notify_progress(progress, {'stage': 'port_warning', 'block': request.block_name, 'detail': ports_detail})
progress({'stage': 'port_warning', 'block': request.block_name, 'detail': ports_detail})
if request.strict_port_check:
return finish(VerifyResult('BLOCKED', stderr=ports_detail))
@@ -875,17 +844,14 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
'cancel_signal': str(root/'cancel-worker.signal'),
'start_gate': str(root/'start-worker.signal')}
consent = None
if request.post_repair_proof is not None:
from .post_repair_consent import PostRepairProof, ConsentController, exact_prompt
if not isinstance(request.post_repair_proof, PostRepairProof):
return finish(VerifyResult('BLOCKED', stderr='POST_REPAIR_PROOF_REQUIRED', safe_to_continue=False))
job['post_repair_consent'] = request.post_repair_proof.for_job(job)
consent = ConsentController(request.post_repair_proof, job)
job_path = root/'request.json'
try:
if request.post_repair_proof is not None:
from .post_repair_consent import PostRepairProof, ConsentController, exact_prompt
if not isinstance(request.post_repair_proof, PostRepairProof):
return finish(VerifyResult('BLOCKED', stderr='POST_REPAIR_PROOF_REQUIRED'))
job['post_repair_consent'] = request.post_repair_proof.for_job(job)
consent = ConsentController(request.post_repair_proof, job)
job_path.write_text(json.dumps(job, ensure_ascii=False), encoding='utf-8')
except Exception as error:
return finish(VerifyResult('FAIL', stderr=str(error)))
job_path.write_text(json.dumps(job, ensure_ascii=False), encoding='utf-8')
events = root/'events.jsonl'
offset = 0
target_pid = None
@@ -905,13 +871,10 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
lock_status = win32event.WaitForSingleObject(mutex, 0)
if lock_status not in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED):
mutex.Close()
return finish(VerifyResult('BLOCKED', stderr='已有 CBB 校验任务运行;本次未启动。',
safe_to_continue=True, error_category='NATIVE_CHANNEL_BUSY'))
worker_launch_attempted = False
return finish(VerifyResult('BLOCKED', stderr='已有 CBB 校验任务运行,请等待结束。', safe_to_continue=False))
try:
timing.begin('worker_setup')
with (root/'worker.log').open('w', encoding='utf-8') as log:
worker_launch_attempted = True
if request.interactive_input:
process = DesktopWorker(
worker_command(job_path), None, interactive_input=True)
@@ -929,10 +892,9 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
if hasattr(process, 'start_companion'):
from .dialog_agent import DialogAgentClient
from .dialog_rules import default_rules_path, load_rules
dialog_agent = DialogAgentClient.start(process, root/'dialog-agent', stop=stop)
dialog_agent = DialogAgentClient.start(process, root/'dialog-agent')
dialog_supervisor = DialogSupervisor(
AgentDialogBackend(dialog_agent, pids=lambda: {
int(pid) for pid in (target_pid, lm_pid, launcher_pid) if pid}),
AgentDialogBackend(dialog_agent),
rules=load_rules(default_rules_path()),
)
else:
@@ -945,8 +907,6 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
desktop=process.desktop,
pids=lambda: ({value for value in (target_pid, lm_pid) if value is not None}),
)
if stop is not None and stop.is_set():
raise InterruptedError('VERIFY_CANCELLED: 启动已取消,未启动 PCB')
Path(job['start_gate']).touch()
while process.poll() is None:
if stop is not None and stop.is_set():
@@ -987,7 +947,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
0.1, float(request.timeout_seconds))
deadline.touch()
last_activity_key = activity_key
if progress: _notify_progress(progress, event)
if progress: progress(event)
offset = stream.tell()
if verify_invoked and target_pid is None and time.monotonic() - last_observation >= .5:
from .post_verify_diagnostics import observe_post_verify
@@ -1091,7 +1051,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
if dispatch_failure is not None:
status, detail = dispatch_failure
if progress:
_notify_progress(progress, {
progress({
'stage': 'verify_dispatch_failed',
'block': request.block_name,
'detail': detail,
@@ -1110,21 +1070,7 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
except Exception as error:
if 'process' in locals() and process.poll() is None:
_stop_worker(process)
launch_release = getattr(error, 'worker_launch_release', None) if 'process' not in locals() else None
if not worker_launch_attempted:
launch_release = {'process_created': False, 'worker_exited': True,
'safe_to_continue': True, 'remaining_pids': []}
no_launch = (isinstance(launch_release, dict)
and launch_release.get('process_created') is False
and launch_release.get('worker_exited') is True
and launch_release.get('safe_to_continue') is True
and launch_release.get('remaining_pids') == [])
if no_launch:
_write_optional_evidence(root/'session-release.json', {
**launch_release, 'block': request.block_name, 'library': str(request.lmc_file),
'worker_pid': None})
status = 'CANCELLED' if stop is not None and stop.is_set() else 'FAIL'
return finish(VerifyResult(status, stderr=str(error), safe_to_continue=no_launch))
return finish(VerifyResult('FAIL', stderr=str(error), safe_to_continue=False))
finally:
close_errors = []
worker_exited = False
@@ -1232,16 +1178,16 @@ def _run_verify(request, *, timing, progress=None, flag_reader=None, process_run
def record_attempt(record):
bridge_records.append(record)
if progress:
_notify_progress(progress, {'stage': 'library_flag_probe', 'block': request.block_name, **record})
progress({'stage': 'library_flag_probe', 'block': request.block_name, **record})
try:
probe = read_library_flag_with_retry(
flag_reader or read_library_flag_if_available, Path(request.lmc_file),
request.block_name, on_attempt=record_attempt)
result = apply_post_verify_status(result, probe)
result = replace(result, bridge_attempts=tuple(bridge_records))
_write_optional_evidence(root/'bridge-status.json', bridge_records)
(root/'bridge-status.json').write_text(json.dumps(bridge_records, ensure_ascii=False, indent=2), encoding='utf-8')
if progress:
_notify_progress(progress, {'stage': 'library_flag', 'block': request.block_name,
progress({'stage': 'library_flag', 'block': request.block_name,
'library_flag': result.library_flag, 'detail': result.library_flag_detail})
finally:
timing.end('library_flag')
@@ -1270,7 +1216,7 @@ def run_batch(requests, max_workers=1, verifier=None, *, stop=None, progress=Non
queue_stop = queue_stop or result.status in {'QUEUE_STOP', 'CANCELLED'} or not result.safe_to_continue
if queue_stop and stop is not None:
stop.set()
if progress: _notify_progress(progress, request.block_name, result)
if progress: progress(request.block_name, result)
return results
@@ -1327,7 +1273,7 @@ def write_batch_report(requests, results, root):
lines = ['CBB Verify 批量结果',
'流程: LMC 原生 Verify / ReusableCircuit PCB -> Project Integration -> Save/Close -> IsVerifiedReuseBlock READY(金标准)']
if requests and all(req.maintenance for req in requests):
lines = ['ICDB 批量检查结果', '流程: 原生 PCB 打开检查;不执行 Repair、Restore 或 CBB 校验。']
lines = ['ICDB 批量检查结果', '流程: 原生 Project Backup 加载检查;不执行 Repair、Restore 或 CBB 校验。']
for req, result in zip(requests, results):
detail = _report_field(result.stderr or result.stdout.strip()[:200])
seconds = ' '.join(f'{key}={value:.3f}s' +
-87
View File
@@ -1,87 +0,0 @@
from threading import Event, Thread
import time
def test_native_queue_is_fifo_and_waiting_cancel_never_runs_action():
from cbb_refresh_verify.operation_queue import NativeQueue, QueueCancelled
queue = NativeQueue()
holding, release, waiting, cancelled = Event(), Event(), Event(), Event()
order = []
first = Thread(target=lambda: queue.run(lambda: (holding.set(), release.wait(3), order.append('first'))))
first.start(); assert holding.wait(1)
def second():
try: queue.run(lambda: order.append('cancelled'), stop=cancelled, waiting=waiting.set)
except QueueCancelled: pass
second_thread = Thread(target=second); second_thread.start(); assert waiting.wait(1)
cancelled.set(); second_thread.join(1); assert not second_thread.is_alive()
third = Thread(target=lambda: queue.run(lambda: order.append('third')))
third.start(); release.set(); first.join(2); third.join(2)
assert order == ['first', 'third']
def test_background_scan_keeps_ui_usable_and_yields_between_projects(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
started, release = Event(), Event()
order = []
def verify(request):
order.append(request.block_name)
if request.block_name == 'Beta':
started.set(); release.wait(3)
return VerifyResult('CHECKED')
window = load_window(qtbot, tmp_path, monkeypatch, verifier=verify)
window._run(['Beta', 'Gamma'], maintenance=True)
try:
qtbot.waitUntil(started.is_set)
assert not window.busy and window.search_edit.isEnabled() and window.load_button.isEnabled()
window.search_edit.setText('Gamma')
assert [r.name for r in window.visible_records()] == ['Gamma']
window._start(lambda: order.append('foreground'), lambda _: None)
qtbot.wait(30)
assert order == ['Beta']
release.set()
qtbot.waitUntil(lambda: not window.icdb_task.active and not window.busy)
assert order == ['Beta', 'foreground', 'Gamma']
assert window.search_edit.text() == 'Gamma'
assert window.icdb_repair_button.isEnabled()
finally:
release.set()
def test_unconfirmed_open_is_amber_and_does_not_claim_icdb_damage(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
window = load_window(qtbot, tmp_path, monkeypatch, verifier=lambda _: VerifyResult('FAIL',
error_category='DATABASE_SAFETY_STOP', stderr='Continue to open read/write?'))
window._run(['Beta'], maintenance=True)
qtbot.waitUntil(lambda: not window.icdb_task.active)
cell = window.cbb_table.item(window._row_by_name['Beta'], 3)
assert '未确认' in cell.text() and 'ICDB 错误' not in cell.text()
assert cell.background().color().name() == '#fff8e1'
def test_completed_old_library_result_does_not_release_new_library(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
from pathlib import Path
window = load_window(qtbot, tmp_path, monkeypatch, verifier=lambda _: VerifyResult('FAIL', safe_to_continue=False))
window._run(['Beta'], maintenance=True)
qtbot.waitUntil(lambda: not window._icdb_active())
summary = window.icdb_summary
window.lmc_edit.setText('other.lmc')
next(button for button in summary.buttons() if '释放' in button.text()).click()
assert getattr(window, 'release_dialog', None) is None
assert '切' in window.status_label.text()
def test_later_management_invalidates_old_recovery_offer(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from test_reimport_recovery import failed_repair
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda _: failed_repair(tmp_path/'old/result.json', safe=True))
window._run(['Beta'], maintenance=True)
qtbot.waitUntil(lambda: not window._icdb_active())
action = next(b for b in window.icdb_summary.buttons() if '副本' in b.text())
assert action.isEnabled()
window._invalidate_check_targets('test.lmc', ['Beta'])
assert not action.isEnabled() and not window._reimport_offers
-122
View File
@@ -1,122 +0,0 @@
"""Background check and foreground queue interaction regressions."""
from threading import Event
import pytest
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
def background(window, qtbot):
started, release = Event(), Event()
calls=[]
def verify(request):
calls.append(request.block_name)
if request.block_name=='Beta':
started.set()
assert release.wait(5)
return VerifyResult('CHECKED')
window.verifier=verify
window._run(['Beta','Gamma'],maintenance=True)
qtbot.waitUntil(started.is_set)
return release,calls
def finish(window, qtbot, release):
release.set()
window.icdb_task.resume()
qtbot.waitUntil(lambda:not window._icdb_active() and not window.busy)
qtbot.waitUntil(lambda:window.pool.activeThreadCount()==0)
def test_stop_whole_queue_does_not_resume_background_checks(qtbot,tmp_path,monkeypatch):
window=load_window(qtbot,tmp_path,monkeypatch)
release,calls=background(window,qtbot)
try:
window._start(lambda:None,lambda _:None)
qtbot.waitUntil(lambda:bool(window.native_queue.pending))
window.stop_button.click()
release.set()
qtbot.waitUntil(lambda:not window._icdb_active() and not window.busy)
assert calls==['Beta'],f'Cancelled queue still ran: {calls}'
finally:finish(window,qtbot,release)
def test_check_progress_survives_queued_verify(qtbot,tmp_path,monkeypatch):
window=load_window(qtbot,tmp_path,monkeypatch,
status_refresher=lambda names,path:{name:'PENDING' for name in names})
release,calls=background(window,qtbot)
try:
assert not window.icdb_progress.isHidden()
window._run(['Gamma'])
assert not window.icdb_progress.isHidden(),'Queued verify hid the active check progress'
finally:finish(window,qtbot,release)
def test_release_failure_is_not_labelled_as_read_write_prompt(qtbot,tmp_path,monkeypatch):
window=load_window(qtbot,tmp_path,monkeypatch,verifier=lambda request:VerifyResult(
'FAIL',error_category='DATABASE_SAFETY_STOP',safe_to_continue=False,
stderr='PCB_RELEASE_UNCONFIRMED: launcher still running'))
window._run(['Beta'],maintenance=True)
qtbot.waitUntil(lambda:not window._icdb_active())
cell=window.cbb_table.item(window._row_by_name['Beta'],3)
assert '读写确认' not in cell.text(),cell.text()
def test_pending_check_skips_a_target_that_has_become_ready(qtbot,tmp_path,monkeypatch):
window=load_window(qtbot,tmp_path,monkeypatch)
release,calls=background(window,qtbot)
try:
window.icdb_task.pause()
release.set()
qtbot.waitUntil(lambda:len(window.icdb_task.results)==1 and not window.icdb_task.running)
window._apply_refreshed_records((('Gamma',),{'Gamma':'READY'},{},''))
assert 'Gamma' in window.ready_names
window.icdb_task.resume()
qtbot.waitUntil(lambda:not window._icdb_active())
assert calls==['Beta'],f'Already READY target was opened again: {calls}'
finally:finish(window,qtbot,release)
def test_worker_refresh_excludes_ready_before_any_gui_result_callback(qtbot,tmp_path,monkeypatch):
window=load_window(qtbot,tmp_path,monkeypatch,
status_refresher=lambda names,path:{name:'READY' for name in names})
release,calls=background(window,qtbot)
try:
window._start(lambda:window._read_affected_records(('Gamma',)),lambda payload:None)
qtbot.waitUntil(lambda:bool(window.native_queue.pending))
release.set()
qtbot.waitUntil(lambda:not window._icdb_active() and not window.busy)
assert window._records_by_name['Gamma'].status=='UNKNOWN'
assert calls==['Beta']
assert window.icdb_task.results[1].status=='SKIPPED'
assert 'READY' in window.icdb_task.results[1].stderr
finally:finish(window,qtbot,release)
def test_another_library_ready_status_cannot_skip_this_library_target(qtbot,tmp_path,monkeypatch):
window=load_window(qtbot,tmp_path,monkeypatch)
release,calls=background(window,qtbot)
try:
window._publish_check_statuses('other.lmc',{'Gamma':'READY'})
release.set()
qtbot.waitUntil(lambda:not window._icdb_active())
assert calls==['Beta','Gamma']
finally:finish(window,qtbot,release)
@pytest.mark.parametrize('detail,safe,expected',[
('Continue to open the design with read/write access permission?',True,'读写确认'),
('PCB_RELEASE_UNCONFIRMED: launcher still running',False,'释放未确认'),
('ICDB_RELEASE_UNCONFIRMED: database still occupied',False,'释放未确认'),
('PCB_SESSION_ACTIVE: target already open',True,'会话或数据库状态待确认'),
])
def test_safety_stop_label_tracks_actual_reason(qtbot,tmp_path,monkeypatch,detail,safe,expected):
window=load_window(qtbot,tmp_path,monkeypatch,verifier=lambda request:VerifyResult(
'FAIL',error_category='DATABASE_SAFETY_STOP',safe_to_continue=safe,stderr=detail))
window._run(['Beta'],maintenance=True)
qtbot.waitUntil(lambda:not window._icdb_active())
cell=window.cbb_table.item(window._row_by_name['Beta'],3)
assert expected in cell.text()
assert cell.toolTip()==detail
assert cell.background().color().name()=='#fff8e1'
-54
View File
@@ -152,60 +152,6 @@ def test_idle_guard_queries_supported_native_process_names(recovery_files, monke
assert any("Name='viewdraw.exe'" in query for query in queries)
def test_idle_guard_ignores_unrelated_project_and_prefix_sibling(recovery_files, monkeypatch):
from cbb_refresh_verify.backup_recovery import _idle_check
from cbb_refresh_verify import mentor_adapter
request, original, _ = recovery_files
unrelated = original.parent.with_name(original.parent.name+'Old')/'PCB/A.pcb'
monkeypatch.setattr(mentor_adapter, 'pcb_processes', lambda: [(123, '', str(unrelated))])
monkeypatch.setattr(mentor_adapter, '_process_details', lambda name:
[(123, 'ExpeditionPCB.exe', f'ExpeditionPCB.exe "{unrelated}" -ReusableCircuit', 0)]
if name == 'ExpeditionPCB.exe' else [])
_idle_check(request.lmc_file, original, original.parent/'PCB/A.pcb')
def test_idle_guard_rejects_exact_target_process(recovery_files, monkeypatch):
from cbb_refresh_verify.backup_recovery import _idle_check
from cbb_refresh_verify import mentor_adapter
request, original, _ = recovery_files
target = original.parent/'PCB/A.pcb'
monkeypatch.setattr(mentor_adapter, 'pcb_processes', lambda: [])
monkeypatch.setattr(mentor_adapter, '_process_details', lambda name:
[(123, 'ExpeditionPCB.exe', f'ExpeditionPCB.exe "{target}" -ReusableCircuit', 0)]
if name == 'ExpeditionPCB.exe' else [])
with pytest.raises(ValueError, match='TARGET_NATIVE_OWNER_ACTIVE'):
_idle_check(request.lmc_file, original, target)
def test_prelaunch_recovery_rejection_has_no_unreleased_session(recovery_files):
from cbb_refresh_verify.backup_recovery import recover_from_backup
request, _, source = recovery_files
def reject(*args): raise ValueError('target unavailable before launch')
result = recover_from_backup(request, source, idle_check=reject,
verifier=lambda *a, **k: pytest.fail('prelaunch rejection must not start native'))
assert result.status == 'BLOCKED'
assert result.safe_to_continue
def test_report_write_failure_does_not_lose_prelaunch_release_fact(recovery_files, monkeypatch):
from cbb_refresh_verify.backup_recovery import recover_from_backup
import win32event
from uuid import uuid4
create_mutex = win32event.CreateMutex
monkeypatch.setattr(win32event, 'CreateMutex', lambda security, owned, name:
create_mutex(security, owned, name+'-test-'+uuid4().hex))
request, _, source = recovery_files
original_write = Path.write_text
def write(path, *args, **kwargs):
if path.name == 'recovery-result.json': raise OSError('report disk unavailable')
return original_write(path, *args, **kwargs)
monkeypatch.setattr(Path, 'write_text', write)
def reject(*args): raise ValueError('prelaunch unavailable')
result = recover_from_backup(request, source, idle_check=reject)
assert result.status == 'BLOCKED' and result.safe_to_continue
assert 'report disk unavailable' in result.stderr
def test_copy_refuses_directory_junction_before_copying(tmp_path):
import subprocess
from cbb_refresh_verify.backup_recovery import _copy_verified
+4 -23
View File
@@ -84,30 +84,11 @@ def test_scan_reuses_checkpoint_and_queries_only_missing(tmp_path):
encoding="utf-8",
)
bridge = FakeBridge()
records = BatchStatusSession(bridge).scan(["A", "B"], lmc, checkpoint, resume=True)
records = BatchStatusSession(bridge).scan(["A", "B"], lmc, checkpoint)
assert bridge.requests == ["B"]
assert {record.block_name for record in records} == {"A", "B"}
def test_default_scan_refreshes_cached_ready_after_payload_change(tmp_path):
lmc = tmp_path/'library.lmc'; lmc.write_bytes(b'library')
checkpoint = tmp_path/'scan.jsonl'
BatchStatusSession(FakeBridge()).scan(['A'], lmc, checkpoint)
# The lightweight fingerprint cannot prove payload status is unchanged.
fingerprint = fingerprint_library(lmc)
(tmp_path/'payload.pcb').write_bytes(b'native edit without LMC change')
assert fingerprint_library(lmc) == fingerprint
class PendingBridge(FakeBridge):
def query(self, *args, **kwargs):
self.requests.append(args[1])
return BridgeResult('PENDING', 'fake')
bridge = PendingBridge()
records = BatchStatusSession(bridge).scan(['A'], lmc, checkpoint)
assert [record.status for record in records] == ['PENDING']
assert bridge.requests == ['A']
assert len(checkpoint.read_text('utf-8').splitlines()) == 1
def test_timeout_isolated_and_later_item_continues(tmp_path):
lmc = tmp_path / "mentor_lib.lmc"
lmc.write_bytes(b"library")
@@ -118,7 +99,7 @@ def test_timeout_isolated_and_later_item_continues(tmp_path):
assert records[1].status == "PENDING"
def test_protocol_path_mismatch_records_each_queried_item(tmp_path):
def test_protocol_path_mismatch_stops_repeating_same_global_failure(tmp_path):
class BrokenProtocolBridge:
def __init__(self):
self.requests = []
@@ -135,7 +116,7 @@ def test_protocol_path_mismatch_records_each_queried_item(tmp_path):
['A', 'B', 'C'], lmc, tmp_path / 'scan.jsonl'
)
assert bridge.requests == ['A', 'B', 'C']
assert bridge.requests == ['A']
assert [record.status for record in records] == ['MALFORMED'] * 3
@@ -199,7 +180,7 @@ def test_retry_rechecks_failed_scan_without_library_changes(tmp_path):
first = BatchStatusSession(FakeBridge(timeout_name='A')).scan(['A', 'B'], lmc, checkpoint)
assert first[0].status == 'TIMEOUT'
bridge = FakeBridge()
second = BatchStatusSession(bridge).scan(['A', 'B'], lmc, checkpoint, resume=True)
second = BatchStatusSession(bridge).scan(['A', 'B'], lmc, checkpoint)
assert bridge.requests == ['A']
assert second[0].status == 'READY'
+1 -1
View File
@@ -82,5 +82,5 @@ def test_fingerprint_change_does_not_reuse_checkpoint(tmp_path):
from cbb_refresh_verify.status_bridge import BridgeResult
return BridgeResult("PENDING", "fake")
bridge = Bridge()
BatchStatusSession(bridge).scan(["A"], lmc, checkpoint, resume=True)
BatchStatusSession(bridge).scan(["A"], lmc, checkpoint)
assert bridge.requests == ["A"]
+14 -165
View File
@@ -1,60 +1,33 @@
import pytest
@pytest.mark.parametrize('failure, expected', [
('desktop', []),
('job', ['desktop']),
('process', ['job', 'desktop']),
('thread', ['thread', 'terminate', 'process', 'job', 'desktop']),
])
def test_constructor_rolls_back_allocated_resources(monkeypatch, failure, expected):
def test_constructor_releases_private_desktop_when_process_launch_fails(monkeypatch):
import cbb_refresh_verify.desktop_worker as module
closed = []
error = RuntimeError(failure + ' failed')
class Handle:
def __init__(self):
self.closed = False
class FakeJob:
def Close(self):
closed.append('job')
self.closed = True
class FakeDesktop:
def CloseDesktop(self):
closed.append('desktop')
self.closed = True
class FakeProcess:
def Close(self):
closed.append('process')
desktop = Handle()
job = Handle()
class FakeThread:
def Close(self):
closed.append('thread')
raise error
def allocate(stage, value):
if failure == stage:
raise error
return value
process = FakeProcess()
monkeypatch.setattr(module.win32service, 'CreateDesktop',
lambda *args: allocate('desktop', FakeDesktop()))
monkeypatch.setattr(module.win32job, 'CreateJobObject',
lambda *args: allocate('job', FakeJob()))
monkeypatch.setattr(module.win32service, 'CreateDesktop', lambda *args: desktop)
monkeypatch.setattr(module.win32job, 'CreateJobObject', lambda *args: job)
monkeypatch.setattr(module.win32process, 'STARTUPINFO', lambda: type('Startup', (), {})())
monkeypatch.setattr(module.win32process, 'CreateProcess',
lambda *args: allocate('process', (process, FakeThread(), 321, 1)))
lambda *args: (_ for _ in ()).throw(RuntimeError('launch failed')))
def terminate(handle, code):
assert handle is process
closed.append('terminate')
monkeypatch.setattr(module.win32process, 'TerminateProcess', terminate)
with pytest.raises(RuntimeError) as caught:
with pytest.raises(RuntimeError, match='launch failed'):
module.DesktopWorker(['worker.exe'], 'PrivateDesk')
assert caught.value is error
assert closed == expected
assert desktop.closed is True
assert job.closed is True
def test_library_flag_loads_ui_dependencies_before_creating_private_desktop(monkeypatch, tmp_path):
@@ -81,127 +54,3 @@ def test_library_flag_loads_ui_dependencies_before_creating_private_desktop(monk
module.read_library_flag('library.lmc', 'Block')
assert created == []
@pytest.mark.parametrize('reader', ['read_library_flag', 'read_library_tree_image_map'])
def test_reader_does_not_create_desktop_before_preparation_finishes(monkeypatch, tmp_path, reader):
import win32service
import cbb_refresh_verify.mentor_adapter as module
closed = []
class FakeDesktop:
def CloseDesktop(self):
closed.append('closed')
class InvalidLibrary:
def __fspath__(self):
raise ValueError('invalid library path')
executable = tmp_path / 'LibraryManager.exe'
executable.touch()
monkeypatch.setattr(module, 'library_manager_path', lambda: executable)
monkeypatch.setattr(win32service, 'CreateDesktop',
lambda *args: closed.append('created') or FakeDesktop())
with pytest.raises(ValueError, match='invalid library path'):
getattr(module, reader)(InvalidLibrary(), 'Block')
assert closed == []
@pytest.mark.parametrize('reader', ['read_library_flag', 'read_library_tree_image_map'])
def test_reader_closes_desktop_when_process_launch_fails(monkeypatch, tmp_path, reader):
import win32service
import win32process
import cbb_refresh_verify.mentor_adapter as module
closed = []
class FakeDesktop:
def CloseDesktop(self):
closed.append('desktop')
def fail(*args):
raise RuntimeError('launch failed')
executable = tmp_path / 'LibraryManager.exe'
executable.touch()
monkeypatch.setattr(module, 'library_manager_path', lambda: executable)
monkeypatch.setattr(win32service, 'CreateDesktop', lambda *args: FakeDesktop())
monkeypatch.setattr(win32process, 'CreateProcess', fail)
if reader == 'read_library_flag':
flag, detail = module.read_library_flag(tmp_path / 'library.lmc', 'Block')
assert flag == module.FLAG_UNKNOWN
assert 'launch failed' in detail
else:
with pytest.raises(RuntimeError, match='launch failed'):
module.read_library_tree_image_map(tmp_path / 'library.lmc', ['Block'])
assert closed == ['desktop']
def test_constructor_releases_private_desktop_when_process_launch_fails(monkeypatch):
import cbb_refresh_verify.desktop_worker as module
class Handle:
def __init__(self):
self.closed = False
def Close(self):
self.closed = True
def CloseDesktop(self):
self.closed = True
desktop = Handle()
job = Handle()
monkeypatch.setattr(module.win32service, 'CreateDesktop', lambda *args: desktop)
monkeypatch.setattr(module.win32job, 'CreateJobObject', lambda *args: job)
monkeypatch.setattr(module.win32process, 'STARTUPINFO', lambda: type('Startup', (), {})())
monkeypatch.setattr(module.win32process, 'CreateProcess',
lambda *args: (_ for _ in ()).throw(RuntimeError('launch failed')))
with pytest.raises(RuntimeError, match='launch failed') as caught:
module.DesktopWorker(['worker.exe'], 'PrivateDesk')
assert desktop.closed is True
assert job.closed is True
assert caught.value.worker_launch_release == {
'process_created': False, 'safe_to_continue': True, 'worker_exited': True, 'remaining_pids': []}
def test_partial_launch_cleanup_never_claims_native_descendants_released(monkeypatch):
import cbb_refresh_verify.desktop_worker as module
class Handle:
def Close(self): pass
def CloseDesktop(self): pass
class Thread:
def Close(self): raise OSError('thread handle cleanup failed')
monkeypatch.setattr(module.win32service, 'CreateDesktop', lambda *args: Handle())
monkeypatch.setattr(module.win32job, 'CreateJobObject', lambda *args: Handle())
monkeypatch.setattr(module.win32process, 'STARTUPINFO', lambda: type('Startup', (), {})())
monkeypatch.setattr(module.win32process, 'CreateProcess', lambda *args: (Handle(), Thread(), 123, 456))
terminated = []
monkeypatch.setattr(module.win32process, 'TerminateProcess', lambda *args: terminated.append(args))
with pytest.raises(OSError, match='thread handle cleanup failed') as caught:
module.DesktopWorker(['worker.exe'], 'PrivateDesk')
assert caught.value.worker_launch_release == {
'process_created': True, 'safe_to_continue': False, 'worker_exited': False, 'remaining_pids': [123]}
assert len(terminated) == 1
def test_release_probe_allows_measured_owner_helper_startup_time(monkeypatch):
import cbb_refresh_verify.desktop_worker as module
from cbb_refresh_verify import owner_probe
worker = module.DesktopWorker.__new__(module.DesktopWorker)
worker.pid = 123
worker._closed = True
worker._exit_code = 1
def query(names, *, timeout_seconds):
# Real helper measured ~4.75s including interpreter + COM startup.
if timeout_seconds < 5:
raise RuntimeError('OWNER_QUERY_TIMEOUT')
return []
monkeypatch.setattr(owner_probe, 'query_owners', query)
assert worker.automation_release_state() == {'safe_to_continue': True, 'remaining_pids': []}
-338
View File
@@ -1,338 +0,0 @@
import importlib
import importlib.util
from pathlib import Path
import pytest
@pytest.fixture
def diagnostic():
assert importlib.util.find_spec('cbb_refresh_verify.diagnostic_open') is not None, 'diagnostic open module is missing'
return importlib.import_module('cbb_refresh_verify.diagnostic_open')
@pytest.fixture
def job(tmp_path):
project = tmp_path / 'IP101GR'
pcb = project / 'PCB/IP101GR.pcb'
pcb.parent.mkdir(parents=True)
pcb.write_bytes(b'pcb')
return {'project': str(project / 'IP101GR.prj'), 'pcb': str(pcb), 'root': str(tmp_path / 'evidence'),
'desktop': 'CbbDiagnosticTest', 'timeout': .03}
def write_logs(job, *, pid=42, foreign=False, success=True):
project = Path(job['project']).parent
logdir = Path(job['pcb']).parent / 'LogFiles'
logdir.mkdir(parents=True, exist_ok=True)
pcb = str(Path(job['pcb'])) if not foreign else str(project.parent / 'other/PCB/IP101GR.pcb')
(logdir / 'PCBAutoSave.txt').write_text('Job Name: ' + pcb + '\n', encoding='utf-8')
(logdir / 'PCBLogFile.txt').write_text('Successfully read the design.\n' if success else 'Loading\n', encoding='utf-8')
database = str(project / 'database') if not foreign else str(project.parent / 'other/database')
logs = project / 'database/cdbsvr/log/current'
logs.mkdir(parents=True, exist_ok=True)
(logs / 'current.txt').write_text(
f'S: Project path [{database}] on file system [NTFS]\n'
f'S: Project file (.prj) path [{project / "IP101GR.prj"}] on file system [NTFS]\n'
f'S: Started up automatically by iCDB Client: ABS:ABS:{pid}\n'
'S: iCDB database loaded\n'
f'SC[455]: Registered sub-client [Expedition PCB_123] with ID [1] for session ID [455] host [Abs] user [ABS] process ID [{pid}]\n',
encoding='utf-8')
def test_old_success_logs_are_not_current_open_evidence(diagnostic, job):
write_logs(job)
baseline = diagnostic.snapshot_diagnostic_logs(job)
assert diagnostic._load_evidence(job, 42, baseline) is None
@pytest.mark.parametrize('pid,foreign,success', [(99, False, True), (42, True, True), (42, False, False)])
def test_foreign_pid_path_or_incomplete_load_cannot_pass(diagnostic, job, pid, foreign, success):
baseline = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job, pid=pid, foreign=foreign, success=success)
assert diagnostic._load_evidence(job, 42, baseline) is None
def test_current_full_path_and_pcb_pid_logs_prove_open_only(diagnostic, job):
baseline = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
evidence = diagnostic._load_evidence(job, 42, baseline)
assert evidence['pcb'] == job['pcb']
assert evidence['pcb_pid'] == 42
def test_old_prefix_in_appended_log_cannot_supply_target_identity(diagnostic, job):
write_logs(job)
baseline = diagnostic.snapshot_diagnostic_logs(job)
for path in Path(job['project']).parent.rglob('*.txt'):
with path.open('a', encoding='utf-8') as output:
output.write('unrelated new record\n')
assert diagnostic._load_evidence(job, 42, baseline) is None
def frame(job, *, title='IP101GR'):
return {'hwnd': 10, 'pid': 42, 'class': 'Afx:123',
'text': f'Expedition PCB - Reusable Block - [{title}]', 'enabled': True,
'children': [{'hwnd': 11, 'class': 'MDIClient', 'text': '', 'parent': 10},
{'hwnd': 12, 'class': 'Afx:document', 'text': title, 'parent': 11}]}
def test_target_title_without_target_mdi_does_not_pass(diagnostic, job):
window = frame(job)
window['children'][1]['text'] = 'another_project'
assert diagnostic._target_frame([window], Path(job['pcb']).stem) is None
class Session:
instances = []
def __init__(self, job, pid, launcher):
self.alive = True
self.closed = False
self.posted = []
self.instances.append(self)
def pcb_alive(self):
return self.alive
def launcher_alive(self):
return self.alive
def post(self, hwnd, message):
self.posted.append((hwnd, message))
self.alive = False
def close(self):
self.closed = True
def test_unknown_prompt_is_preserved_and_never_closed(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [frame(job),
{'hwnd': 20, 'pid': 42, 'class': '#32770', 'text': 'Unknown question', 'children': []}])
with pytest.raises(RuntimeError, match='DIAGNOSTIC_CLOSE_UNCONFIRMED'):
diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert Session.instances[-1].posted == []
assert Session.instances[-1].closed
def test_success_posts_one_exact_close_and_reports_only_open_check(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [frame(job)] if Session.instances[-1].alive else [])
outcome = diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert outcome['status'] == 'PASS'
assert outcome['check'] == 'native_open_only'
assert outcome['native_processes_exited'] is True
assert outcome['library_ownership'] == 'NOT_ASSESSED'
assert Session.instances[-1].posted == [(10, 0x10)]
assert Session.instances[-1].closed
def test_transient_startup_window_cannot_abort_before_target_is_loaded(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
calls = []
def windows(pid):
calls.append(True)
if len(calls) == 1:
return [{'hwnd': 20, 'pid': 42, 'class': 'VendorSplash', 'text': '', 'children': []}]
return [frame(job)] if Session.instances[-1].alive else []
monkeypatch.setattr(diagnostic, '_windows', windows)
job['timeout'] = 1
assert diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)['status'] == 'PASS'
assert Session.instances[-1].posted == [(10, 0x10)]
def test_native_caption_variant_uses_proven_target_mdi(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
target = frame(job)
target['text'] = 'Expedition PCB - [IP101GR]'
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [target] if Session.instances[-1].alive else [])
assert diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)['status'] == 'PASS'
def test_cancel_does_not_wait_for_open_timeout(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
cancel = Path(job['root']).parent / 'cancel'
cancel.touch()
job['cancel_signal'] = str(cancel)
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [])
with pytest.raises(RuntimeError, match='VERIFY_CANCELLED'):
diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert Session.instances[-1].posted == []
assert Session.instances[-1].closed
def test_cancel_after_close_request_still_waits_for_own_launcher_exit(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
cancel = Path(job['root']).parent / 'cancel'
job['cancel_signal'] = str(cancel)
class DelayedLauncher(Session):
polls = 0
def post(self, hwnd, message):
super().post(hwnd, message)
cancel.touch()
def launcher_alive(self):
self.polls += 1
return self.polls < 3
monkeypatch.setattr(diagnostic, '_NativeSession', DelayedLauncher)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [frame(job)] if Session.instances[-1].alive else [])
assert diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)['status'] == 'PASS'
assert Session.instances[-1].polls >= 3
@pytest.mark.parametrize('owner,window_class', [(10, 'VendorModal'), (0, 'VendorModal'),
(0, 'Internet Explorer_Hidden')])
def test_unknown_custom_owned_window_blocks_close(diagnostic, job, monkeypatch, owner, window_class):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [frame(job),
{'hwnd': 20, 'pid': 42, 'class': window_class, 'text': 'Unclassified prompt',
'owner': owner, 'enabled': True, 'children': []}])
with pytest.raises(RuntimeError, match='DIAGNOSTIC_CLOSE_UNCONFIRMED'):
diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert Session.instances[-1].posted == []
def test_empty_desktop_resets_stale_win32_last_error(diagnostic, monkeypatch):
import win32api
import win32gui
import pywintypes
seen = []
def empty(callback, context):
seen.append(win32api.GetLastError())
raise pywintypes.error(0, 'EnumWindows', 'empty desktop')
monkeypatch.setattr(win32gui, 'EnumWindows', empty)
win32api.SetLastError(170)
assert diagnostic._windows(42) == []
assert seen == [0]
def test_missing_launcher_cannot_claim_verified_native_release(diagnostic, job):
with pytest.raises(RuntimeError, match='DIAGNOSTIC_LAUNCHER_REQUIRED'):
diagnostic._NativeSession(job, 42, None)
def test_buffered_full_pcb_path_must_be_verified_after_normal_close(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
autosave = Path(job['pcb']).parent / 'LogFiles/PCBAutoSave.txt'
autosave.write_text('', encoding='utf-8')
class BufferedSession(Session):
def post(self, hwnd, message):
super().post(hwnd, message)
autosave.write_text('Job Name: ' + job['pcb'] + '\n', encoding='utf-8')
monkeypatch.setattr(diagnostic, '_NativeSession', BufferedSession)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [frame(job)] if Session.instances[-1].alive else [])
outcome = diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert outcome['status'] == 'PASS'
assert Session.instances[-1].posted == [(10, 0x10)]
def test_large_unrelated_history_does_not_block_current_evidence(diagnostic, job):
logs = Path(job['project']).parent / 'database/cdbsvr/log'
for index in range(270):
directory = logs / f'2000-01-01 00.00.00-{index:05}'
directory.mkdir(parents=True)
(directory / '2000.01.01.txt').write_bytes(b'old unrelated history\n' * 14000)
baseline = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
assert diagnostic._load_evidence(job, 42, baseline) is not None
def test_pcb_logs_follow_actual_pcb_directory(diagnostic, job):
pcb = Path(job['pcb']).parent.parent / 'AlternativePCB/IP101GR.pcb'
pcb.parent.mkdir()
pcb.write_bytes(b'pcb')
job['pcb'] = str(pcb)
baseline = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
assert diagnostic._load_evidence(job, 42, baseline)['pcb'] == str(pcb)
def test_only_exact_owned_save_prompt_gets_no_after_diagnostic_close(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
class SaveSession(Session):
closing = False
def post(self, hwnd, message):
self.posted.append((hwnd, message))
if message == 0x10:
self.closing = True
else:
self.alive = False
closing_scans = []
def windows(pid):
state = Session.instances[-1]
if not state.closing:
return [frame(job)]
closing_scans.append(True)
if len(closing_scans) == 1:
return [{'hwnd': 20, 'pid': 42, 'class': '#32770', 'text': '',
'owner': 10, 'children': []}]
return [{'hwnd': 20, 'pid': 42, 'class': '#32770', 'text': 'Expedition PCB',
'owner': 10, 'children': [
{'hwnd': 30, 'class': 'Static', 'text': 'Do you want to save the reusable block cell?', 'id': -1},
{'hwnd': 31, 'class': 'Button', 'text': '&No', 'id': 7}]}]
monkeypatch.setattr(diagnostic, '_NativeSession', SaveSession)
monkeypatch.setattr(diagnostic, '_windows', windows)
outcome = diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert outcome['status'] == 'PASS'
assert Session.instances[-1].posted == [(10, 0x10), (31, 0xF5)]
def test_no_pass_when_normal_close_never_flushes_full_pcb_path(diagnostic, job, monkeypatch):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
(Path(job['pcb']).parent / 'LogFiles/PCBAutoSave.txt').write_bytes(b'')
monkeypatch.setattr(diagnostic, '_NativeSession', Session)
monkeypatch.setattr(diagnostic, '_windows', lambda pid: [frame(job)] if Session.instances[-1].alive else [])
with pytest.raises(RuntimeError, match='fresh full PCB path not confirmed after close'):
diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert Session.instances[-1].posted == [(10, 0x10)]
@pytest.mark.parametrize('filename,accepted', [('IP101GR.pcb', True), ('Foreign.pcb', False)])
def test_standard_save_question_requires_exact_target_filename(diagnostic, job, monkeypatch, filename, accepted):
job['diagnostic_log_baseline'] = diagnostic.snapshot_diagnostic_logs(job)
write_logs(job)
class SaveSession(Session):
closing = False
def post(self, hwnd, message):
self.posted.append((hwnd, message))
if message == 0x10:
self.closing = True
else:
self.alive = False
def windows(pid):
if not Session.instances[-1].closing:
return [frame(job)]
return [{'hwnd': 20, 'pid': 42, 'class': '#32770', 'text': 'Expedition PCB', 'owner': 10,
'children': [{'hwnd': 30, 'class': 'Static', 'text': f'Save changes to {filename}?', 'id': -1},
{'hwnd': 31, 'class': 'Button', 'text': '否(&N)', 'id': 7},
{'hwnd': 32, 'class': 'Button', 'text': '是(&Y)', 'id': 6},
{'hwnd': 33, 'class': 'Button', 'text': '取消', 'id': 2}]}]
monkeypatch.setattr(diagnostic, '_NativeSession', SaveSession)
monkeypatch.setattr(diagnostic, '_windows', windows)
if accepted:
assert diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)['status'] == 'PASS'
assert Session.instances[-1].posted == [(10, 0x10), (31, 0xF5)]
else:
with pytest.raises(RuntimeError, match='DIAGNOSTIC_CLOSE_UNCONFIRMED'):
diagnostic.check_target_window(job, 42, emit=lambda **event: None, error_reader=lambda: None)
assert Session.instances[-1].posted == [(10, 0x10)]
def test_recycled_window_from_another_pid_never_receives_close(diagnostic, monkeypatch):
import win32process
session = diagnostic._NativeSession.__new__(diagnostic._NativeSession)
session.pid = 42
session.pcb_alive = lambda: True
monkeypatch.setattr(win32process, 'GetWindowThreadProcessId', lambda hwnd: (1, 99))
with pytest.raises(RuntimeError, match='DIAGNOSTIC_STALE_WINDOW'):
session.post(10, 0x10)
+1 -74
View File
@@ -412,79 +412,6 @@ def test_agent_start_failure_releases_listener(tmp_path):
DialogAgentClient.start(FailedWorker(), tmp_path)
def _slow_start_client(tmp_path, monkeypatch, *, delay, stop=None):
import socket
from types import SimpleNamespace
from cbb_refresh_verify import dialog_agent as module
client = DialogAgentClient.prepare(tmp_path, desktop_name='test')
client.listener.close()
elapsed = [0.0]
class Listener:
closed = False
def settimeout(self, timeout): self.timeout = timeout
def accept(self):
if elapsed[0] < delay:
elapsed[0] += self.timeout
if stop is not None and elapsed[0] >= .4: stop.set()
raise socket.timeout()
return SimpleNamespace(setsockopt=lambda *a: None), None
def close(self): self.closed = True
class Channel:
def __init__(self, connection): pass
def receive(self, timeout): return {'token': client.paths.token}
def send(self, *a): pass
def close(self): pass
client.listener = Listener()
monkeypatch.setattr(module, 'JsonChannel', Channel)
monkeypatch.setattr(module.time, 'monotonic', lambda: elapsed[0])
monkeypatch.setattr(DialogAgentClient, 'prepare', classmethod(lambda cls, *a, **k: client))
worker = SimpleNamespace(name='test', start_companion=lambda command: None)
return client, worker, elapsed
def test_frozen_agent_can_initialize_after_the_old_ten_second_deadline(tmp_path, monkeypatch):
client, worker, elapsed = _slow_start_client(tmp_path, monkeypatch, delay=12)
assert DialogAgentClient.start(worker, tmp_path) is client
assert elapsed[0] >= 12 and client.channel is not None
assert client.timeout_seconds == 2 # Normal IPC does not inherit the startup budget.
def test_agent_startup_wait_responds_to_cancel_without_starting_pcb(tmp_path, monkeypatch):
import pytest
from threading import Event
stop = Event()
client, worker, elapsed = _slow_start_client(tmp_path, monkeypatch, delay=100, stop=stop)
with pytest.raises(InterruptedError, match='VERIFY_CANCELLED'):
DialogAgentClient.start(worker, tmp_path, stop=stop)
assert elapsed[0] < 1 and client.listener.closed
def test_agent_startup_still_has_an_absolute_deadline(tmp_path, monkeypatch):
import pytest
client, worker, elapsed = _slow_start_client(tmp_path, monkeypatch, delay=100)
with pytest.raises(TimeoutError):
DialogAgentClient.start(worker, tmp_path)
assert 29 <= elapsed[0] <= 31 and client.listener.closed
def test_cancellation_during_authenticated_handshake_never_releases_startup(tmp_path, monkeypatch):
import pytest
from threading import Event
from cbb_refresh_verify import dialog_agent as module
stop = Event()
client, worker, _ = _slow_start_client(tmp_path, monkeypatch, delay=0)
class Channel:
def __init__(self, connection): pass
def receive(self, timeout):
stop.set()
return {'token': client.paths.token}
def close(self): pass
monkeypatch.setattr(module, 'JsonChannel', Channel)
with pytest.raises(InterruptedError, match='VERIFY_CANCELLED'):
DialogAgentClient.start(worker, tmp_path, stop=stop)
assert client.channel is None and client.listener.closed
def test_memory_channel_timeout_is_bounded_and_partial_packets_survive():
import socket
import pytest
@@ -509,7 +436,7 @@ def test_loopback_connection_rejects_wrong_agent_token(tmp_path):
import socket
import pytest
from cbb_refresh_verify.dialog_agent import JsonChannel, DialogAgentProtocolError
client = DialogAgentClient.prepare(tmp_path, desktop_name='test', timeout_seconds=2)
client = DialogAgentClient.prepare(tmp_path, desktop_name='test', timeout_seconds=.3)
wrong = JsonChannel(socket.create_connection(('127.0.0.1', client.paths.port), timeout=1))
try:
wrong.send({'token': 'not-the-agent'})
-12
View File
@@ -86,18 +86,6 @@ def test_probe_keeps_visible_non_dialog_classes():
assert snapshots[0].process_name == "proc-1010.exe"
def test_pid_scope_excludes_foreign_dialog_before_child_or_uia_read():
gui = FakeGui({10: {'class_name': '#32770', 'text': 'owned'},
20: {'class_name': '#32770', 'text': 'other project'}})
class Uia:
def controls(self, hwnd):
assert hwnd == 10, 'Foreign project was probed'
return ()
probe = make_probe(gui, (20, 10), Uia())
assert [w.hwnd for w in probe.capture(PHASE, pids={1010})] == [10]
assert probe.capture(PHASE, pids=set()) == ()
def test_disappearing_window_is_skipped_without_hiding_other_windows():
gui = FakeGui({
10: {"class_name": "GXWND", "text": "gone"},
-31
View File
@@ -1,31 +0,0 @@
import json
from types import SimpleNamespace
import pytest
@pytest.mark.parametrize('cancel,gate_present', [(False, False), (True, False), (True, True)])
def test_worker_waits_for_cold_agent_but_cancellation_never_opens_pcb(tmp_path, monkeypatch, cancel, gate_present):
from cbb_refresh_verify import mentor_adapter as adapter
import pythoncom
gate, stop = tmp_path/'start.signal', tmp_path/'cancel.signal'
if gate_present: gate.touch()
if cancel: stop.touch()
clock, opened = [0.0], []
def advance(seconds):
clock[0] += seconds
if not cancel and clock[0] >= 20: gate.touch()
monkeypatch.setattr(adapter, 'time', SimpleNamespace(monotonic=lambda: clock[0], sleep=advance,
strftime=lambda *_: 'test'))
monkeypatch.setattr(pythoncom, 'CoInitialize', lambda: None)
monkeypatch.setattr(pythoncom, 'CoUninitialize', lambda: None)
monkeypatch.setattr(adapter, 'execute_job', lambda *args: opened.append(True) or {'status': 'PASS'})
job = tmp_path/'request.json'
job.write_text(json.dumps({'root': str(tmp_path), 'block_name': 'fixture',
'start_gate': str(gate), 'cancel_signal': str(stop)}), encoding='utf-8')
result = adapter.worker_main(job)
assert result == (1 if cancel else 0)
assert opened == ([] if cancel else [True])
if cancel:
outcome = json.loads((tmp_path/'outcome.json').read_text('utf-8'))
assert 'VERIFY_CANCELLED' in outcome['stderr']
+1 -2
View File
@@ -72,8 +72,7 @@ def test_serial_guard_covers_preflight_and_content_check(tmp_path, monkeypatch):
try:
second = runner.run_verify(VerifyRequest(tmp_path/'lib.lmc', 'second', tmp_path/'evidence'))
assert second.status == 'BLOCKED'
assert second.safe_to_continue
assert second.error_category == 'NATIVE_CHANNEL_BUSY'
assert not second.safe_to_continue
assert calls == ['first']
finally:
release.set()
+4 -95
View File
@@ -50,7 +50,7 @@ def test_failed_startup_normally_closes_owned_empty_pcb(tmp_path, monkeypatch, t
@pytest.mark.parametrize('obstacle', ['baseline', 'wrong_path', 'path_prefix', 'desktop', 'address',
'dialog', 'document_title', 'mdi_document', 'disabled'])
'dialog', 'document_title', 'mdi_document', 'disabled', 'no_diagnosis'])
def test_failed_startup_preserves_unconfirmed_or_busy_session(tmp_path, monkeypatch, obstacle):
import win32gui
from cbb_refresh_verify import native_repair_ui
@@ -79,97 +79,6 @@ def test_failed_startup_preserves_unconfirmed_or_busy_session(tmp_path, monkeypa
assert not messages
def test_owned_empty_shell_closes_without_an_icdb_diagnosis(tmp_path, monkeypatch):
job, records, messages = startup_fixture(tmp_path, monkeypatch)
(tmp_path/'diagnostics/icdb-recovery.json').unlink()
result = failed_session.close_failed_startup(job, 12, timeout_seconds=0)
assert result['status'] == 'CLOSED' and not records and len(messages) == 1
def read_write_fixture(tmp_path, monkeypatch):
import win32gui, win32con
from cbb_refresh_verify.post_repair_consent import PROMPT_TEXT
job, records, messages = startup_fixture(tmp_path, monkeypatch)
(tmp_path/'diagnostics/icdb-recovery.json').unlink()
visible = {100, 200}
classes = {100: 'Afx:main', 200: '#32770', 201: 'Button', 202: 'Button', 203: 'Static'}
names = {100: 'Expedition PCB', 200: 'Expedition PCB', 201: 'Yes', 202: 'No', 203: PROMPT_TEXT}
identifiers = {201: 6, 202: 7, 203: 65535}
monkeypatch.setattr(win32gui, 'EnumWindows', lambda fn, arg: [fn(h, arg) for h in tuple(visible)])
monkeypatch.setattr(win32gui, 'EnumChildWindows', lambda h, fn, arg:
[fn(c, arg) for c in (201, 202, 203)] if h == 200 else None)
monkeypatch.setattr(win32gui, 'GetClassName', classes.__getitem__)
monkeypatch.setattr(win32gui, 'GetWindowText', names.__getitem__)
monkeypatch.setattr(win32gui, 'GetDlgCtrlID', identifiers.__getitem__)
monkeypatch.setattr(win32gui, 'IsWindowEnabled', lambda h: h != 100 or 200 not in visible)
monkeypatch.setattr(win32gui, 'IsWindowVisible', lambda h: h in visible or h in identifiers)
def post(hwnd, message, *_):
messages.append((hwnd, message))
if hwnd == 202 and message == win32con.BM_CLICK:
visible.remove(200)
elif hwnd == 100 and message == win32con.WM_CLOSE:
records.clear()
monkeypatch.setattr(win32gui, 'PostMessage', post)
return job, records, messages, names, visible
def test_captured_read_write_question_is_declined_and_own_empty_shell_exits(tmp_path, monkeypatch):
import win32con
job, records, messages, _, _ = read_write_fixture(tmp_path, monkeypatch)
# A pre-existing address must not prevent cancelling our own attempted open.
address = tmp_path/'database/cdbsvr/sAddress.adr'
address.parent.mkdir(parents=True)
address.write_text('existing foreign or stale address')
result = failed_session.close_failed_startup(job, 12, timeout_seconds=0)
assert result['status'] == 'CLOSED' and result['release']['safe_to_continue']
assert messages == [(202, win32con.BM_CLICK), (100, win32con.WM_CLOSE)]
assert not records and address.read_text() == 'existing foreign or stale address'
assert result['cancelled_prompt'] == 'read_write_access'
@pytest.mark.parametrize('obstacle', ['text', 'foreign_pid', 'baseline', 'wrong_path', 'desktop', 'stuck'])
def test_read_write_cancel_never_accepts_unconfirmed_or_unclosed_prompt(tmp_path, monkeypatch, obstacle):
import win32gui, win32process, win32con
from cbb_refresh_verify import native_repair_ui
job, records, messages, names, _ = read_write_fixture(tmp_path, monkeypatch)
if obstacle == 'text': names[203] += ' Different recovery operation.'
if obstacle == 'foreign_pid':
monkeypatch.setattr(win32process, 'GetWindowThreadProcessId', lambda h: (1, 99 if h == 200 else 12))
if obstacle == 'wrong_path': records[0] = (12, records[0][1], 'other.pcb -ReusableCircuit', 11)
if obstacle == 'desktop': monkeypatch.setattr(native_repair_ui, '_current_desktop_name', lambda: 'Default')
if obstacle == 'stuck':
monkeypatch.setattr(win32gui, 'PostMessage', lambda h, m, *_: messages.append((h, m)))
result = failed_session.close_failed_startup(job, 12,
baseline_pids=(12,) if obstacle == 'baseline' else (), timeout_seconds=0)
assert result['status'] == 'RETAINED' and records
assert messages == ([(202, win32con.BM_CLICK)] if obstacle == 'stuck' else [])
def test_version_choice_is_cancelled_without_selecting_or_confirming_a_version(tmp_path, monkeypatch):
import win32gui, win32con
from test_pcb_version_choice import captured
job, records, messages, _, visible = read_write_fixture(tmp_path, monkeypatch)
snapshot = captured()
children = [c for c in snapshot.controls if c.handle and c.handle != snapshot.hwnd]
mapping = {300+i: c for i, c in enumerate(children)}
monkeypatch.setattr(win32gui, 'EnumChildWindows', lambda h, fn, arg:
[fn(c, arg) for c in mapping] if h == 200 else None)
monkeypatch.setattr(win32gui, 'GetClassName', lambda h: mapping[h].class_name if h in mapping else
'#32770' if h == 200 else 'Afx:main')
monkeypatch.setattr(win32gui, 'GetWindowText', lambda h: mapping[h].name if h in mapping else
'Database Restoration' if h == 200 else 'Expedition PCB')
monkeypatch.setattr(win32gui, 'GetDlgCtrlID', lambda h: mapping[h].control_id)
cancel = next(h for h, c in mapping.items() if c.control_id == 2)
def post(h, m, *_):
messages.append((h, m))
if h == cancel: visible.remove(200)
elif h == 100: records.clear()
monkeypatch.setattr(win32gui, 'PostMessage', post)
result = failed_session.close_failed_startup(job, 12, timeout_seconds=0)
assert result['status'] == 'CLOSED' and result['cancelled_prompt'] == 'pcb_version_choice'
assert messages == [(cancel, win32con.BM_CLICK), (100, win32con.WM_CLOSE)]
def test_requested_close_without_exit_is_not_reported_closed(tmp_path, monkeypatch):
import win32gui
job, records, messages = startup_fixture(tmp_path, monkeypatch)
@@ -260,13 +169,13 @@ def test_failed_startup_accepts_current_owned_database_failure_dialog(tmp_path,
@pytest.mark.parametrize('pid,phase', [(99, 'PCB_STARTING'), (12, 'SAVING')])
def test_unrelated_failure_record_is_not_needed_to_close_own_empty_shell(tmp_path, monkeypatch, pid, phase):
def test_failed_startup_rejects_unrelated_failure_dialog(tmp_path, monkeypatch, pid, phase):
job, records, messages = startup_fixture(tmp_path, monkeypatch)
(tmp_path/'diagnostics/icdb-recovery.json').unlink()
(tmp_path/'dialogs.jsonl').write_text(json.dumps({
'pid': pid, 'phase': phase, 'error_code': 'MENTOR_DATABASE_LOAD_FAILED'})+'\n')
assert failed_session.close_failed_startup(job, 12, timeout_seconds=0)['status'] == 'CLOSED'
assert len(messages) == 1 and not records
assert failed_session.close_failed_startup(job, 12, timeout_seconds=0)['status'] == 'RETAINED'
assert not messages
@pytest.mark.parametrize('exits', [True, False])
+194 -159
View File
@@ -1,159 +1,194 @@
"""Batch ICDB checks open diagnostically without dispatching Repair."""
from dataclasses import replace
import json
import pytest
from test_maintenance_entry import case, no_native_launch
@pytest.mark.parametrize('scenario,status,category,safe', [
('healthy', 'CHECKED', '', True),
('fault', 'FAIL', 'ICDB_REPAIR_REQUIRED', True),
('generic', 'FAIL', 'MENTOR_DATABASE_LOAD_FAILED', True),
('unreleased', 'FAIL', 'MENTOR_DATABASE_LOAD_FAILED', False),
('cancelled', 'CANCELLED', '', True),
])
def test_batch_check_opens_pcb_without_repair(case, monkeypatch, scenario, status, category, safe):
from cbb_refresh_verify import verify_runner as runner, native_repair, maintenance_entry as entry
from test_icdb_open_check import NATIVE_ERROR
request, _, address = case
calls = []
def open_pcb(probe, **kwargs):
assert probe.diagnostic_only and not probe.maintenance and not probe.auto_repair
calls.append('open')
return runner.VerifyResult('PASS' if scenario=='healthy' else 'CANCELLED' if scenario=='cancelled' else 'FAIL',
stderr=NATIVE_ERROR if scenario=='fault' else '' if scenario in ('healthy','cancelled') else 'Failed to open document.',
error_category='' if scenario in ('healthy','cancelled') else 'MENTOR_DATABASE_LOAD_FAILED',
safe_to_continue=scenario!='unreleased')
monkeypatch.setattr(runner,'_run_verify_serialized',open_pcb)
monkeypatch.setattr(native_repair,'run_native_repair',lambda *a,**k:pytest.fail('scan requested Project Backup'))
monkeypatch.setattr(entry,'assert_native_idle',lambda:pytest.fail('scan used host-wide owner gate'))
result=runner.run_verify(replace(request,auto_repair=True))
assert calls==['open']
assert (result.status,result.error_category,result.safe_to_continue)==(status,category,safe)
assert result.library_flag=='UNKNOWN' and result.recovery_attempts==()
assert address.read_bytes()==b'old server address - preserved'
record=json.loads(result.evidence_path.read_text('utf-8'))
assert record['operation']=='icdb_batch_check' and record['automatic_repair'] is False
@pytest.mark.parametrize('before_launch',[True,False])
def test_cancellation_never_dispatches_repair_or_reports_a_clean_check(case,monkeypatch,before_launch):
from threading import Event
from cbb_refresh_verify import verify_runner as runner
request,_,_=case
stop=Event();calls=[]
if before_launch:stop.set()
def open_pcb(probe,**kwargs):
calls.append('open');stop.set()
return runner.VerifyResult('PASS')
monkeypatch.setattr(runner,'_run_verify_serialized',open_pcb)
result=runner.run_verify(request,stop=stop)
assert result.status=='CANCELLED' and result.safe_to_continue
assert calls==([] if before_launch else ['open'])
def test_released_icdb_fault_continues_the_check_batch(case,monkeypatch):
from cbb_refresh_verify import verify_runner as runner
from test_icdb_open_check import NATIVE_ERROR
request,_,_=case
calls=[]
def open_pcb(probe,**kwargs):
calls.append('open')
return runner.VerifyResult('FAIL',stderr=NATIVE_ERROR) if len(calls)==1 else runner.VerifyResult('PASS')
monkeypatch.setattr(runner,'_run_verify_serialized',open_pcb)
results=runner.run_batch([request,request])
assert calls==['open','open']
assert [result.status for result in results]==['FAIL','CHECKED']
def test_inspection_ignores_other_pcb_and_skips_exclusive_repair_probe(tmp_path, monkeypatch):
import win32con
from test_native_repair import repair_worker_fixture
from test_native_occupancy import output
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr('cbb_refresh_verify.mentor_adapter.pcb_processes', lambda: [(999, 'other.pcb', '')])
monkeypatch.setattr('cbb_refresh_verify.native_repair.check_repair_access',
lambda *a: pytest.fail('inspection used exclusive Repair admission'))
monkeypatch.setattr(ui, '_repair_command', lambda *a: pytest.fail('inspection resolved Repair command'))
monkeypatch.setattr(ui, '_native_output', lambda *_: output(data['project'], data['database'], busy=True))
assert ui.repair_worker_main(job) == 0
assert actions == [(100, win32con.WM_CLOSE)]
def test_ui_check_summary_reports_findings_and_never_claims_repair(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
from PySide6.QtWidgets import QMessageBox
requests, prompts = [], []
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda req: (requests.append(req) or VerifyResult('FAIL',
error_category='ICDB_REPAIR_REQUIRED', stderr='发现 ICDB 问题,未执行修复。')),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: (prompts.append(a[2]) or QMessageBox.Yes))
window.search_edit.setText('Beta')
window.icdb_repair_button.click(); qtbot.waitUntil(lambda: not window._icdb_active())
assert requests[0].maintenance and not requests[0].auto_repair
assert '批量检查' in window.icdb_repair_button.text()
assert not any('手动备份' in text for text in prompts)
assert window.summary.windowTitle() == 'ICDB 批量检查结果'
assert '发现问题 1' in window.summary.text()
assert '修复并校验通过' not in window.summary.detailedText()
@pytest.mark.parametrize('category,label', [('ICDB_DATABASE_IN_USE', '占用 1'),
('ICDB_INSPECTION_UNCONFIRMED', '无法确认 1')])
def test_busy_or_unknown_inspection_is_not_labelled_as_database_damage(qtbot, tmp_path, monkeypatch, category, label):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda _: VerifyResult('FAIL', error_category=category, stderr='暂未完成检查。'),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
window.search_edit.setText('Beta')
window.icdb_repair_button.click(); qtbot.waitUntil(lambda: not window._icdb_active())
assert label in window.summary.text()
assert 'ICDB 问题' not in window.cbb_table.item(window._row_by_name['Beta'], 3).text()
def test_missing_pcb_is_skipped_from_icdb_batch_check_and_restore(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.models import CbbRecord
from cbb_refresh_verify.verify_runner import VerifyResult
calls = []
window = load_window(qtbot, tmp_path, monkeypatch,
records=(CbbRecord('Missing', 'Power', status='PENDING'),),
verifier=lambda req: (calls.append(req.block_name) or VerifyResult('CHECKED')),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
assert not window.icdb_repair_button.isEnabled()
assert not window.batch_button.isEnabled() and not window.backup_restore_button.isEnabled()
assert calls == []
def test_missing_project_rows_are_excluded_from_icdb_batch_check(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.models import CbbRecord
from cbb_refresh_verify.verify_runner import VerifyResult
window = load_window(qtbot, tmp_path, monkeypatch,
records=(CbbRecord('Missing', 'Power', status='PENDING'),
CbbRecord('Good', 'Power', status='PENDING')),
verifier=lambda req: VerifyResult('CHECKED'),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
window.skipped_names.add('Missing')
window._update()
assert window._maintenance_names() == ['Good']
def test_check_reports_describe_inspection_without_pcb_verification(case, tmp_path):
from cbb_refresh_verify.verify_runner import write_batch_report, failure_report_path, VerifyResult
request, _, _ = case
report = write_batch_report([request], [VerifyResult('FAIL',
error_category='ICDB_REPAIR_REQUIRED', stderr='发现 ICDB 问题,未执行修复。')], tmp_path/'reports')
full = report.read_text('utf-8-sig')
failed = failure_report_path(report).read_text('utf-8-sig')
assert 'ICDB 批量检查' in full and 'Project Integration' not in full
assert 'PCB 打开检查' in full and 'Project Backup 加载检查' not in full
assert 'ICDB 检查异常' in failed and '发现问题: 1' in failed
assert 'ICDB已修复待校验' not in failed
"""Batch ICDB inspection never opens PCB or dispatches Repair."""
from dataclasses import replace
import json
import pytest
from test_maintenance_entry import case, no_native_launch
from test_maintenance_diagnosis import inspection
@pytest.mark.parametrize('scenario,status,category,safe', [
('healthy', 'CHECKED', '', True),
('fault', 'FAIL', 'ICDB_REPAIR_REQUIRED', True),
('busy', 'BLOCKED', 'ICDB_DATABASE_IN_USE', True),
('unknown', 'FAIL', 'ICDB_INSPECTION_UNCONFIRMED', True),
('unexpected_repair', 'FAIL', 'ICDB_INSPECTION_UNCONFIRMED', True),
('missing_exit_proof', 'FAIL', 'ICDB_INSPECTION_UNCONFIRMED', False),
('not_launched', 'FAIL', 'ICDB_INSPECTION_UNCONFIRMED', True),
('unreleased', 'FAIL', 'ICDB_INSPECTION_UNCONFIRMED', False),
('cancelled', 'CANCELLED', '', True),
])
def test_batch_check_only_loads_native_inspection(case, monkeypatch, scenario, status, category, safe):
from cbb_refresh_verify import verify_runner as runner, native_repair, maintenance_entry as entry
from test_native_occupancy import output
request, _, address = case
calls = []
monkeypatch.setattr(runner, '_run_verify_serialized', lambda *a, **k: pytest.fail('check opened PCB'))
monkeypatch.setattr(entry, 'assert_native_idle', lambda: pytest.fail('check used host-wide owner gate'))
def native(target, root, **kw):
assert kw['inspection_only'] is True and not kw.get('maintenance_context')
calls.append('inspect')
record = inspection(target, fault=scenario == 'fault')
if scenario == 'busy':
record.update(status='IN_USE', output=output(target.project, target.database, busy=True))
if scenario in ('unknown', 'unreleased'):
record.update(status='UNCONFIRMED', output='No conclusive native response')
if scenario == 'unreleased': record['release']['native_exited'] = False
if scenario == 'cancelled': record.update(status='CANCELLED')
if scenario == 'unexpected_repair': record.update(status='REPAIRED', repair_requested=True)
if scenario == 'missing_exit_proof': return {}
if scenario == 'not_launched': return {'status': 'BLOCKED', 'native_started': False}
return record
monkeypatch.setattr(native_repair, 'run_native_repair', native)
result = runner.run_verify(replace(request, auto_repair=True))
assert calls == ['inspect']
assert (result.status, result.error_category, result.safe_to_continue) == (status, category, safe)
assert result.library_flag == 'UNKNOWN' and result.recovery_attempts == ()
assert address.read_bytes() == b'old server address - preserved'
record = json.loads(result.evidence_path.read_text('utf-8'))
assert record['operation'] == 'icdb_batch_check' and record['automatic_repair'] is False
@pytest.mark.parametrize('case_type', ['no_layout', 'no_pcb', 'no_icdb', 'ambiguous_repair_targets'])
def test_inspection_does_not_require_repair_admission(case, monkeypatch, case_type):
from cbb_refresh_verify import verify_runner as runner, native_repair
request, project, address = case
if case_type == 'no_layout': (project.parent/'PCB/Layout/LayoutDB.lyt').unlink()
if case_type == 'no_pcb': (project.parent/'PCB/IP101GR.pcb').unlink()
if case_type == 'no_icdb': (project.parent/'database/icdb.dat').unlink()
if case_type == 'ambiguous_repair_targets':
address.unlink()
(project.parent/'PCB/pcb.prj').write_text('KEY iCDBDir "database"\n')
db = project.parent/'PCB/database'; db.mkdir(); (db/'icdb.dat').touch()
calls = []
def native(target, *a, **kw):
assert kw['inspection_only'] is True and target.project == project
calls.append('inspect')
return inspection(target)
monkeypatch.setattr(native_repair, 'run_native_repair', native)
result = runner.run_verify(request)
assert calls == ['inspect']
assert result.recovery_attempts == ()
@pytest.mark.parametrize('before_launch', [True, False])
def test_cancellation_never_dispatches_repair_or_reports_a_clean_check(case, monkeypatch, before_launch):
from threading import Event
from cbb_refresh_verify import verify_runner as runner, native_repair
request, _, _ = case
stop = Event(); calls = []
if before_launch: stop.set()
def native(target, *a, **kw):
assert kw['inspection_only'] is True
calls.append('inspect'); stop.set()
return inspection(target)
monkeypatch.setattr(native_repair, 'run_native_repair', native)
result = runner.run_verify(request, stop=stop)
assert result.status == 'CANCELLED' and result.safe_to_continue
assert calls == ([] if before_launch else ['inspect'])
def test_released_icdb_fault_continues_the_check_batch(case, monkeypatch):
from cbb_refresh_verify import verify_runner as runner, native_repair
request, _, _ = case
calls = []
def native(target, root, **kw):
assert kw['inspection_only'] is True
calls.append('inspect')
return inspection(target, fault=len(calls) == 1)
monkeypatch.setattr(native_repair, 'run_native_repair', native)
monkeypatch.setattr(runner, '_run_verify_serialized', lambda *a, **k: pytest.fail('check opened PCB'))
results = runner.run_batch([request, request])
assert calls == ['inspect', 'inspect']
assert [result.status for result in results] == ['FAIL', 'CHECKED']
def test_inspection_ignores_other_pcb_and_skips_exclusive_repair_probe(tmp_path, monkeypatch):
import win32con
from test_native_repair import repair_worker_fixture
from test_native_occupancy import output
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr('cbb_refresh_verify.mentor_adapter.pcb_processes', lambda: [(999, 'other.pcb', '')])
monkeypatch.setattr('cbb_refresh_verify.native_repair.check_repair_access',
lambda *a: pytest.fail('inspection used exclusive Repair admission'))
monkeypatch.setattr(ui, '_repair_command', lambda *a: pytest.fail('inspection resolved Repair command'))
monkeypatch.setattr(ui, '_native_output', lambda *_: output(data['project'], data['database'], busy=True))
assert ui.repair_worker_main(job) == 0
assert actions == [(100, win32con.WM_CLOSE)]
def test_ui_check_summary_reports_findings_and_never_claims_repair(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
from PySide6.QtWidgets import QMessageBox
requests, prompts = [], []
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda req: (requests.append(req) or VerifyResult('FAIL',
error_category='ICDB_REPAIR_REQUIRED', stderr='发现 ICDB 问题,未执行修复。')),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: (prompts.append(a[2]) or QMessageBox.Yes))
window.search_edit.setText('Beta')
window.icdb_repair_button.click(); qtbot.waitUntil(lambda: not window.busy)
assert requests[0].maintenance and not requests[0].auto_repair
assert '批量检查' in window.icdb_repair_button.text()
assert not any('手动备份' in text for text in prompts)
assert window.summary.windowTitle() == 'ICDB 批量检查结果'
assert '发现问题 1' in window.summary.text()
assert '修复并校验通过' not in window.summary.detailedText()
@pytest.mark.parametrize('category,label', [('ICDB_DATABASE_IN_USE', '占用 1'),
('ICDB_INSPECTION_UNCONFIRMED', '无法确认 1')])
def test_busy_or_unknown_inspection_is_not_labelled_as_database_damage(qtbot, tmp_path, monkeypatch, category, label):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda _: VerifyResult('FAIL', error_category=category, stderr='暂未完成检查。'),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
window.search_edit.setText('Beta')
window.icdb_repair_button.click(); qtbot.waitUntil(lambda: not window.busy)
assert label in window.summary.text()
assert 'ICDB 问题' not in window.cbb_table.item(window._row_by_name['Beta'], 3).text()
def test_missing_pcb_is_skipped_from_icdb_batch_check_and_restore(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.models import CbbRecord
from cbb_refresh_verify.verify_runner import VerifyResult
calls = []
window = load_window(qtbot, tmp_path, monkeypatch,
records=(CbbRecord('Missing', 'Power', status='PENDING'),),
verifier=lambda req: (calls.append(req.block_name) or VerifyResult('CHECKED')),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
assert not window.icdb_repair_button.isEnabled()
assert not window.batch_button.isEnabled() and not window.backup_restore_button.isEnabled()
assert calls == []
def test_missing_project_rows_are_excluded_from_icdb_batch_check(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.models import CbbRecord
from cbb_refresh_verify.verify_runner import VerifyResult
window = load_window(qtbot, tmp_path, monkeypatch,
records=(CbbRecord('Missing', 'Power', status='PENDING'),
CbbRecord('Good', 'Power', status='PENDING')),
verifier=lambda req: VerifyResult('CHECKED'),
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
window.skipped_names.add('Missing')
window._update()
assert window._maintenance_names() == ['Good']
def test_check_reports_describe_inspection_without_pcb_verification(case, tmp_path):
from cbb_refresh_verify.verify_runner import write_batch_report, failure_report_path, VerifyResult
request, _, _ = case
report = write_batch_report([request], [VerifyResult('FAIL',
error_category='ICDB_REPAIR_REQUIRED', stderr='发现 ICDB 问题,未执行修复。')], tmp_path/'reports')
full = report.read_text('utf-8-sig')
failed = failure_report_path(report).read_text('utf-8-sig')
assert 'ICDB 批量检查' in full and 'Project Integration' not in full
assert 'ICDB 检查异常' in failed and '发现问题: 1' in failed
assert 'ICDB已修复待校验' not in failed
-133
View File
@@ -1,133 +0,0 @@
"""PCB open errors identify ICDB findings by native content, never by code alone."""
from dataclasses import replace
import json
import pytest
from test_maintenance_entry import case, no_native_launch
NATIVE_ERROR = (
'Database cannot be loaded and the server cannot be started, the project will not be opened. '
"Please use iCDB Project Backup 'Repair project' functionality to fix this issue. "
'(Database [C:\\isolated\\Work\\database\\icdb.dat] in old, unsupported format)')
@pytest.mark.parametrize('message,expected', [
(NATIVE_ERROR, True),
('Unable to open iCDB connection.', True),
('iCDB database check FAILED', True),
('iCDB database check PASSED', False),
('0x8004021E: Failed to open document.', False),
('ICDB_REPAIR_REQUIRED: Failed to open document.', False),
('Cannot open [C:\\icdb\\icdb.dat].', False),
('PCB file was not found. Evidence: C:\\icdb\\result.json', False),
])
def test_error_content_requires_an_icdb_failure_message(message, expected):
from cbb_refresh_verify.icdb_recovery import icdb_error_content
assert bool(icdb_error_content(message)) is expected
def test_unknown_icdb_description_in_an_actual_open_error_is_retained():
from cbb_refresh_verify.icdb_recovery import icdb_error_content
assert icdb_error_content('iCDB connection: E_NEW_NATIVE_CODE', error_message=True)
@pytest.mark.parametrize('mode', ['append', 'rewrite', 'retained', 'unchanged'])
def test_native_error_content_is_from_this_open_attempt(tmp_path, mode):
from cbb_refresh_verify.icdb_recovery import snapshot_log, read_icdb_error
path = tmp_path/'PCBLogFile.txt'
previous = 'old header\n'+NATIVE_ERROR+'\n' if mode in ('retained','unchanged') else 'old header\n'
path.write_text(previous, 'utf-8')
baseline = snapshot_log(path)
if mode == 'append': path.write_text(previous+NATIVE_ERROR, 'utf-8')
elif mode == 'rewrite': path.write_text('new header\n'+NATIVE_ERROR, 'utf-8')
elif mode == 'retained': path.write_text('new header\n'+NATIVE_ERROR+'\nNormal startup', 'utf-8')
assert bool(read_icdb_error(path, baseline)) is (mode in ('append','rewrite'))
@pytest.mark.parametrize('failure,category', [(NATIVE_ERROR,'ICDB_REPAIR_REQUIRED'),
('0x8004021E: Failed to open document.','MENTOR_DATABASE_LOAD_FAILED')])
def test_batch_scan_opens_without_repair_and_classifies_native_content(case, monkeypatch, failure, category):
from cbb_refresh_verify import maintenance_entry as entry, verify_runner as runner, native_repair
request, _, address = case
probes=[]
monkeypatch.setattr(native_repair,'run_native_repair',lambda *a,**k:pytest.fail('scan dispatched Project Backup'))
def diagnose(probe, **kw):
probes.append(probe)
return runner.VerifyResult('FAIL',stderr=failure,error_category='MENTOR_DATABASE_LOAD_FAILED')
monkeypatch.setattr(runner,'run_verify',diagnose)
result=entry.run_icdb_check(replace(request,auto_repair=True))
assert len(probes)==1 and probes[0].diagnostic_only and not probes[0].maintenance
assert not probes[0].auto_repair and not probes[0].native_lm_verify
assert result.status=='FAIL' and result.error_category==category and result.safe_to_continue
assert result.library_flag=='UNKNOWN' and result.recovery_attempts==()
assert address.read_bytes()==b'old server address - preserved'
def test_scan_uses_the_current_open_evidence_even_when_popup_is_generic(case, monkeypatch):
from cbb_refresh_verify import maintenance_entry as entry, verify_runner as runner
request, _, _=case
def diagnose(probe, **kw):
root=probe.evidence_dir/'verify-current'; (root/'diagnostics').mkdir(parents=True)
(root/'diagnostics/icdb-error-content.json').write_text(json.dumps(
{'native_message':NATIVE_ERROR,'source':'PCBLogFile.txt'}),'utf-8')
result=root/'result.json'; result.write_text('{}','utf-8')
return runner.VerifyResult('FAIL',stderr='Problem encountered while opening one of the database files.',
evidence_path=result,error_category='MENTOR_DATABASE_LOAD_FAILED')
monkeypatch.setattr(runner,'run_verify',diagnose)
result=entry.run_icdb_check(request)
assert result.error_category=='ICDB_REPAIR_REQUIRED' and NATIVE_ERROR in result.stderr
def test_scan_does_not_reuse_an_older_operation_error_evidence(case, monkeypatch):
from cbb_refresh_verify import maintenance_entry as entry, verify_runner as runner
request,_,_=case
root=request.evidence_dir/'older-operation';(root/'diagnostics').mkdir(parents=True)
(root/'diagnostics/icdb-error-content.json').write_text(json.dumps({'native_message':NATIVE_ERROR}),'utf-8')
result=root/'result.json';result.write_text('{}','utf-8')
monkeypatch.setattr(runner,'run_verify',lambda *a,**k:runner.VerifyResult('FAIL',
stderr='Failed to open document.',error_category='MENTOR_DATABASE_LOAD_FAILED',evidence_path=result))
scanned=entry.run_icdb_check(request)
assert scanned.error_category=='MENTOR_DATABASE_LOAD_FAILED'
def test_error_capture_retains_the_new_native_corruption_detail(tmp_path):
from cbb_refresh_verify.icdb_recovery import snapshot_log
from cbb_refresh_verify.verify_diagnostics import collect_native_failure_logs
pcb=tmp_path/'PCB/CBB.pcb'; log=pcb.parent/'LogFiles/PCBLogFile.txt'
log.parent.mkdir(parents=True)
evidence=tmp_path/'evidence'; (evidence/'diagnostics').mkdir(parents=True)
baseline=snapshot_log(log)
(evidence/'diagnostics/startup-log-baseline.json').write_text(json.dumps(
{'source':str(log),'baseline':baseline}),'utf-8')
log.write_text(NATIVE_ERROR,'utf-8')
collect_native_failure_logs(pcb,evidence)
record=json.loads((evidence/'diagnostics/icdb-error-content.json').read_text('utf-8'))
assert record['source']==str(log) and record['native_message']==NATIVE_ERROR
@pytest.mark.parametrize('scenario', ['current', 'other_pid', 'old', 'other_database'])
def test_repeated_failure_uses_only_this_pcb_process_icdb_log(tmp_path, scenario):
import os,time
from cbb_refresh_verify.verify_diagnostics import collect_native_client_error
root=tmp_path/'evidence'; (root/'diagnostics').mkdir(parents=True)
logs=tmp_path/'Client/Logs'
pid=123
started=time.time_ns()-1_000_000_000
folder=logs/('2026-11-05 12.00.00-'+str(321 if scenario=='other_pid' else pid))
folder.mkdir(parents=True)
source=folder/'2026.11.05.iCDBManager.txt'
database=tmp_path/'Work/database'
message=f'SingleFile: ERROR: Database [{database}/icdb.dat] in old, unsupported format'
if scenario=='other_database': message=message.replace(str(database),'C:/other/database')
source.write_text(f'PID [{pid}]\n'+message,'utf-8')
if scenario=='old':os.utime(source,ns=(started-1_000_000_000,started-1_000_000_000))
(root/'diagnostics/native-client-context.json').write_text(json.dumps(
{'native_pid':pid,'started_ns':started,'client_log_root':str(logs),'database':str(database)}),'utf-8')
collect_native_client_error(root)
result=root/'diagnostics/icdb-error-content.json'
assert result.exists() is (scenario=='current')
if result.exists():
record=json.loads(result.read_text('utf-8'))
assert record['native_pid']==pid and 'unsupported format' in record['native_message']
+17 -21
View File
@@ -6,7 +6,7 @@ from test_maintenance_entry import case
def test_verify_defaults_to_no_repair_and_does_not_retain_a_failure_lock(tmp_path, monkeypatch):
from cbb_refresh_verify import verify_runner as runner, library_lock as locks, native_repair
library = tmp_path / 'library/library.lmc'; library.parent.mkdir(); library.touch()
library = tmp_path / 'library.lmc'; library.touch()
req = runner.VerifyRequest(library, 'CBB', tmp_path / 'evidence')
assert req.auto_repair is False
marker = locks.blocker_path(library)
@@ -16,17 +16,11 @@ def test_verify_defaults_to_no_repair_and_does_not_retain_a_failure_lock(tmp_pat
error_category='ICDB_REPAIR_REQUIRED', safe_to_continue=True)
monkeypatch.setattr(runner, '_run_verify_serialized', lambda *a, **k: (calls.append('verify') or result))
monkeypatch.setattr(native_repair, 'attempt_recovery', lambda *a, **k: pytest.fail('verify requested Repair'))
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
monkeypatch.setattr('cbb_refresh_verify.native_engineering_identity._process_snapshot', lambda: [])
first = runner.run_verify(req)
assert first.status == result.status and first.error_category == result.error_category
assert first.release_proof['status'] == 'RELEASE_CONFIRMED'
assert runner.run_verify(req) is result
assert runner.run_verify(req) is result
assert calls == ['verify', 'verify']
assert not marker.exists()
archive = Path(first.release_proof['evidence_path']).with_name('blocker-before-0.json')
assert archive.read_text() == 'historical diagnostic record'
assert locks._key(library.parent / '.library.cbb-upload.lock') not in locks._owners
assert marker.read_text() == 'historical diagnostic record'
assert locks._key(tmp_path / '.library.cbb-upload.lock') not in locks._owners
def test_catalog_checkpoint_does_not_disable_ordinary_verify(qtbot, tmp_path, monkeypatch):
@@ -81,15 +75,11 @@ def test_loading_a_different_library_clears_old_management_block(qtbot, tmp_path
def test_targeted_native_idle_ignores_unrelated_native_command(tmp_path, monkeypatch):
from cbb_refresh_verify import maintenance_entry as entry
from cbb_refresh_verify.native_repair import RepairTarget
work = tmp_path/'target/Work'; work.mkdir(parents=True)
library = tmp_path/'library.lmc'; library.touch()
project = work/'target.prj'
project.write_text(f'KEY CentralLibrary "{library}"\n', encoding='utf-8')
other_pcb = tmp_path/'other/Work/PCB/other.pcb'
project = tmp_path/'target.prj'; project.touch()
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda names: [
{'pid': 10, 'name': 'ExpeditionPCB.exe', 'command': f'ExpeditionPCB.exe "{other_pcb}"'},
{'pid': 10, 'name': 'ExpeditionPCB.exe', 'command': 'ExpeditionPCB.exe other.pcb'},
])
entry.assert_native_idle(RepairTarget(project, work/'database'))
entry.assert_native_idle(RepairTarget(project, tmp_path/'database'))
def test_maintenance_guard_does_not_scan_other_cbb_projects(case, monkeypatch):
@@ -158,14 +148,20 @@ def test_live_writer_keeps_execution_lock_without_a_permanent_diagnostic_blocker
if owner: owner['handle'].Close()
def test_healthy_open_with_old_address_does_not_lock_management(case, monkeypatch):
def test_healthy_native_inspection_with_old_address_does_not_lock_management(case, monkeypatch):
from cbb_refresh_verify import native_repair, verify_runner as runner, library_lock as locks
from test_native_occupancy import output
request, project, address = case
monkeypatch.setattr(runner, '_run_verify_serialized', lambda *a, **kw: runner.VerifyResult('PASS'))
monkeypatch.setattr(native_repair, 'run_native_repair', lambda *a, **kw: pytest.fail('scan requested Project Backup'))
def inspect(target, *a, **kw):
assert kw['inspection_only']
return {'inspection_only': True, 'repair_requested': False, 'repair_required': False,
'status': 'NOT_IN_USE', 'native_pid': 777, 'native_exit_code': 0,
'project': str(target.project), 'database': str(target.database),
'output': output(target.project, target.database), 'release': {'native_exited': True}}
monkeypatch.setattr(native_repair, 'run_native_repair', inspect)
result = runner.run_verify(request)
assert result.status == 'CHECKED' and result.safe_to_continue and address.exists()
assert not result.stderr and '未发现 ICDB 错误' in result.stdout
assert not result.stderr and '无需修复' in result.stdout
assert not locks.blocker_path(request.lmc_file).exists()
with locks.LibraryLock(request.lmc_file): pass
+1 -19
View File
@@ -134,24 +134,6 @@ def test_release_proof_checks_addresses_and_exclusive_databases(tmp_path, monkey
assert proof['exclusive_files'] == [str(library)]
def test_release_does_not_resolve_every_unrelated_generated_file(tmp_path, monkeypatch):
from pathlib import Path
import cbb_refresh_verify.library_lock as locks
import cbb_refresh_verify.owner_probe as probe
monkeypatch.setattr(probe, 'query_owners', lambda *_: [])
library = tmp_path/'lib.lmc'; library.touch()
outputs = tmp_path/'generated'; outputs.mkdir()
for index in range(100): (outputs/f'{index}.log').touch()
database = tmp_path/'database/icdb.dat'; database.parent.mkdir(); database.touch()
resolve = Path.resolve
def guarded(path, *a, **kw):
assert path.parent != outputs, 'Release resolved unrelated generated content'
return resolve(path, *a, **kw)
monkeypatch.setattr(Path, 'resolve', guarded)
with locks._prove_library_released(library) as proof:
assert set(proof['exclusive_files']) == {str(library), str(database)}
def test_scoped_release_ignores_another_cbb_address(tmp_path, monkeypatch):
import cbb_refresh_verify.library_lock as locks
import cbb_refresh_verify.owner_probe as probe
@@ -279,7 +261,7 @@ def test_arbitrary_guard_filename_is_preserved_and_primary(tmp_path, monkeypatch
assert marker.name in manifest['files']
from contextlib import contextmanager
@contextmanager
def proof(*a, **kw): yield {'native_owners': [], 'addresses': [], 'exclusive_files': [str(library)]}
def proof(*a): yield {'native_owners': [], 'addresses': [], 'exclusive_files': [str(library)]}
monkeypatch.setattr(locks, '_prove_library_released', proof)
with pytest.raises(locks.LibraryBusy):
locks.release_retained_library(library, tmp_path/'release')
+1 -1
View File
@@ -280,7 +280,7 @@ def test_takeover_preserves_old_checkpoint_until_every_guard_passes(case, monkey
if change == 'foreign_library': record['library'] = str(library.parent.parent/'foreign/mentor.lmc')
marker.write_text('broken json' if change == 'malformed' else json.dumps(record), encoding='utf-8')
old = marker.read_bytes()
monkeypatch.setattr(locks, '_recorded_supervisor_alive', lambda record: change == 'live_foreign')
monkeypatch.setattr(locks, '_supervisor_alive', lambda pid: change == 'live_foreign')
if change == 'guard_failure':
monkeypatch.setattr(entry, 'assert_native_idle', lambda: (_ for _ in ()).throw(ValueError('guard failed')))
archive = request.evidence_dir/'takeover'
-93
View File
@@ -1,93 +0,0 @@
"""Ownership scoping only: no native process or execution mutex is started."""
import json
from types import SimpleNamespace
import pytest
@pytest.fixture
def scope(tmp_path, monkeypatch):
from cbb_refresh_verify.native_repair import RepairTarget
from cbb_refresh_verify import native_management, native_engineering_identity
library = tmp_path/'a/lib.lmc'
library.parent.mkdir()
library.touch()
other = tmp_path/'b/lib.lmc'
other.parent.mkdir()
other.touch()
project = tmp_path/'work/main.prj'
project.parent.mkdir()
project.write_text(f'KEY CentralLibrary "{library}"\n')
target = RepairTarget(project, project.parent/'database')
monkeypatch.setattr(native_management, '_retained_workers', [])
monkeypatch.setattr(native_engineering_identity, '_retained_exports', [])
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_a, **_k: [])
return target, library, other
@pytest.mark.parametrize('kind', ['management', 'export'])
@pytest.mark.parametrize('ownership', ['same', 'other', 'unknown'])
def test_retained_native_ownership_is_scoped_only_with_proven_library(scope, monkeypatch, kind, ownership):
from cbb_refresh_verify import maintenance_entry as entry
target, library, other = scope
claimed = library if ownership == 'same' else other if ownership == 'other' else None
worker = SimpleNamespace(poll=lambda: None, cbb_library=claimed)
if kind == 'management':
monkeypatch.setattr('cbb_refresh_verify.native_management._retained_workers', [worker])
else:
monkeypatch.setattr('cbb_refresh_verify.native_engineering_identity._retained_exports',
[(worker, {}, {'library': str(claimed)} if claimed else {})])
if ownership == 'other':
entry.assert_native_idle(target)
else:
with pytest.raises(Exception, match='(OWNER_ACTIVE|exporter)'):
entry.assert_native_idle(target)
@pytest.mark.parametrize('reference', ['missing', 'conflicting', 'invalid', 'empty_extra'])
def test_unproven_library_does_not_exclude_retained_workers(scope, monkeypatch, reference):
from cbb_refresh_verify import maintenance_entry as entry
target, library, other = scope
target.project.write_text('' if reference == 'missing' else
f'KEY CentralLibrary "{library}"\nKEY CentralLibrary "{other}"' if reference == 'conflicting' else
f'KEY CentralLibrary "{library}"\nKEY CentralLibrary ""' if reference == 'empty_extra' else
'KEY CentralLibrary "missing.lmc"')
monkeypatch.setattr('cbb_refresh_verify.native_management._retained_workers',
[SimpleNamespace(poll=lambda: None, cbb_library=other)])
with pytest.raises(ValueError, match='OWNER_ACTIVE'):
entry.assert_native_idle(target)
@pytest.mark.parametrize('source', ['project', 'pcb', 'database', 'lmc', 'shared', 'job', 'unknown', 'other'])
def test_native_commands_include_target_and_shared_library_ownership(scope, monkeypatch, tmp_path, source):
from cbb_refresh_verify import maintenance_entry as entry
target, library, other = scope
job = tmp_path/'request.json'
job.write_text(json.dumps({'library': str(library)}))
command = {
'project': f'ExpeditionPCB.exe "{target.project}"',
'pcb': f'ExpeditionPCB.exe "{target.project.parent / "PCB/board.pcb"}"',
'database': f'iCDBProjectBackup.exe -icdb="{target.database}"',
'lmc': f'LibraryManager.exe "{library}"',
'shared': f'viewdraw.exe -project="{library.parent / "SymbolLibs/database"}"',
'job': f'python.exe --management-worker "{job}"',
'unknown': 'ExpeditionPCB.exe',
'other': f'LibraryManager.exe "{other}"',
}[source]
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_a, **_k:
[{'pid': 987654, 'name': 'python.exe' if source == 'job' else 'ExpeditionPCB.exe',
'command': command}])
if source == 'other':
entry.assert_native_idle(target)
else:
with pytest.raises(ValueError, match='OWNER_ACTIVE'):
entry.assert_native_idle(target)
def test_no_target_keeps_global_retained_owner_guard(scope, monkeypatch):
from cbb_refresh_verify import maintenance_entry as entry
_, _, other = scope
monkeypatch.setattr('cbb_refresh_verify.native_management._retained_workers',
[SimpleNamespace(poll=lambda: None, cbb_library=other)])
with pytest.raises(ValueError, match='OWNER_ACTIVE'):
entry.assert_native_idle()
+23 -55
View File
@@ -31,28 +31,12 @@ def test_diagnostic_worker_closes_without_integration_save_or_config_edit(tmp_pa
def forbidden(*args, **kwargs):
pytest.fail('diagnosis attempted integration/save/config rewrite')
monkeypatch.setattr(adapter, 'ensure_pcb_central_library', forbidden)
monkeypatch.setattr(adapter, 'pcb_log_reports_integration_error', forbidden)
original_read = Path.read_bytes
def read_bytes(path):
if path.name in ('ForwardAnnotation.txt', 'MsgBoxResponse.log', 'PartPkg.log'):
pytest.fail('opening check read unrelated integration history')
return original_read(path)
monkeypatch.setattr(Path, 'read_bytes', read_bytes)
monkeypatch.setattr('cbb_refresh_verify.integration.refresh_integration', forbidden)
monkeypatch.setattr('cbb_refresh_verify.desktop_worker.launch_save_helper', forbidden)
monkeypatch.setattr('cbb_refresh_verify.pcb_bridge.wait_for_target_document', forbidden)
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_document', forbidden)
closes = []
def check(job, pid, **kw):
assert pid == 2 and kw['launcher_process'].pid == 1
assert job['diagnostic_log_baseline']['started_ns']
closes.append(job)
kw['emit'](stage='diagnostic_wm_close')
return {'status': 'PASS', 'native_processes_exited': True}
monkeypatch.setattr('cbb_refresh_verify.diagnostic_open.check_target_window', check)
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_document',
lambda job, **kw: closes.append(job) or {'status': 'CLOSED'})
result = execute()
from cbb_refresh_verify.verify_runner import VerifyResult
assert VerifyResult(**result).status == 'PASS'
assert result['status'] == 'PASS'
assert len(closes) == 1
assert not any(e['stage'] in ('save_start', 'saved_and_closed') for e in events)
@@ -63,13 +47,8 @@ def test_diagnostic_close_failure_never_returns_healthy(tmp_path, monkeypatch):
job, events, execute = diagnostic_worker(tmp_path, monkeypatch)
job['diagnostic_only'] = True
closes = []
def check(*a, **kw):
closes.append(a)
kw['emit'](stage='diagnostic_wm_close')
raise RuntimeError('DIAGNOSTIC_CLOSE_UNCONFIRMED')
monkeypatch.setattr('cbb_refresh_verify.diagnostic_open.check_target_window', check)
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_startup',
lambda *a, **kw: pytest.fail('must not send another close after WM_CLOSE'))
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_document',
lambda *a, **kw: closes.append(a) or {'status': 'RETAINED'})
with pytest.raises(RuntimeError, match='DIAGNOSTIC_CLOSE_UNCONFIRMED'):
execute()
assert len(closes) == 1
@@ -92,8 +71,6 @@ def diagnostic_worker(tmp_path, monkeypatch):
job, events, execute = exercise_worker(tmp_path, monkeypatch)
(Path(job['pcb']).parent/'pcb.prj').write_text(
'KEY CentralLibrary "' + job['lmc_file'] + '"\n', encoding='utf-8')
monkeypatch.setattr('cbb_refresh_verify.diagnostic_open.check_target_window',
lambda *a, **kw: {'status': 'PASS', 'native_processes_exited': True})
return job, events, execute
@@ -121,14 +98,19 @@ def test_diagnostic_runner_skips_importer_and_ready_verification(tmp_path, monke
assert captured['diagnostic_only'] is True
def test_diagnostic_cannot_pass_with_unconfirmed_process_exit(tmp_path, monkeypatch):
def test_diagnostic_waits_for_normal_exit_after_close_returns(tmp_path, monkeypatch):
from cbb_refresh_verify import mentor_adapter as adapter
job, events, execute = diagnostic_worker(tmp_path, monkeypatch)
job['diagnostic_only'] = True
monkeypatch.setattr(adapter, 'cleanup_verify_processes',
lambda *a, **kw: {'safe_to_continue': False, 'remaining_pids': [2]})
with pytest.raises(RuntimeError, match='DIAGNOSTIC_CLOSE_UNCONFIRMED'):
execute()
observations = []
def release(*a, **kw):
observations.append(True)
return {'safe_to_continue': len(observations) > 1}
monkeypatch.setattr(adapter, 'cleanup_verify_processes', release)
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_document',
lambda *a, **kw: {'status': 'CLOSED'})
assert execute()['status'] == 'PASS'
assert len(observations) >= 2
@pytest.mark.parametrize('when', ['document_ready', 'closing'])
@@ -141,31 +123,17 @@ def test_diagnostic_checks_late_startup_errors_before_declaring_healthy(tmp_path
source.parent.mkdir(exist_ok=True)
source.write_text("The last server session on different server machine lost the connection to the database. "
f"Machine:[fixture] Path:[{Path(job['project']).parent/'database'}] session:[current]", encoding='utf-8')
def document(*a, **kw):
if when == 'document_ready': late_fault()
return None, None, object()
closes = []
def check(*a, **kw):
if when == 'document_ready':
late_fault()
raise RuntimeError(kw['error_reader']())
def close(*a, **kw):
closes.append(True)
kw['emit'](stage='diagnostic_wm_close')
late_fault()
return {'status': 'PASS', 'native_processes_exited': True}
monkeypatch.setattr('cbb_refresh_verify.diagnostic_open.check_target_window', check)
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_startup',
lambda *a, **kw: {'status': 'CLOSED'})
if when == 'closing': late_fault()
return {'status': 'CLOSED'}
monkeypatch.setattr('cbb_refresh_verify.pcb_bridge.wait_for_target_document', document)
monkeypatch.setattr('cbb_refresh_verify.failed_session.close_failed_document', close)
with pytest.raises(RuntimeError, match='ICDB_REPAIR_REQUIRED'):
execute()
assert len(closes) == (1 if when == 'closing' else 0)
assert len(closes) == 1
assert not any(e['stage'] == 'diagnostic_complete' for e in events)
def test_diagnostic_snapshot_is_before_launch(tmp_path, monkeypatch):
from cbb_refresh_verify import mentor_adapter as adapter
job, events, execute = diagnostic_worker(tmp_path, monkeypatch)
job['diagnostic_only'] = True
def launch(*a):
assert job.get('diagnostic_log_baseline', {}).get('started_ns')
from types import SimpleNamespace
return SimpleNamespace(pid=1)
monkeypatch.setattr(adapter, 'launch_pcb_process', launch)
assert execute()['status'] == 'PASS'
+115 -115
View File
@@ -1,115 +1,115 @@
import json
from pathlib import Path
import pytest
from PySide6.QtCore import Qt
from PySide6.QtWidgets import QMessageBox
def test_only_confirmed_maintenance_sets_explicit_flag(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
calls = []
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda req: (calls.append(req) or VerifyResult('FAIL', safe_to_continue=True)),
status_refresher=lambda names, path: {name: 'PENDING' for name in names})
window.search_edit.setText('Beta')
window.verify_all(); qtbot.waitUntil(lambda: not window.busy)
assert calls and calls[-1].maintenance is False
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.No)
window.repair_icdb_all(); assert len(calls) == 1
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
window.repair_icdb_all(); qtbot.waitUntil(lambda: not window._icdb_active())
assert len(calls) == 2 and calls[-1].maintenance is True
@pytest.mark.parametrize('marker_kind', ['valid', 'foreign', 'malformed'])
def test_old_checkpoint_does_not_force_maintenance_or_disable_verify(qtbot, tmp_path, monkeypatch, marker_kind):
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path, _owners, _guard
from cbb_refresh_verify.ui.main_window import MainWindow
from cbb_refresh_verify.verify_runner import VerifyResult
from cbb_refresh_verify.models import LibraryReadResult, CbbRecord
import cbb_refresh_verify.ui.main_window as ui
library = tmp_path/'library/mentor.lmc'; library.parent.mkdir(); library.touch()
(library.parent/'ReusableBlocksLP/IP101GR').mkdir(parents=True)
with LibraryLock(library, safe_to_release=lambda: False) as lock: pass
with _guard:
owner = _owners.pop(lock.key, None)
if owner: owner['handle'].Close()
marker = blocker_path(library)
if marker_kind == 'malformed': marker.write_text('{}')
if marker_kind == 'foreign':
record = json.loads(marker.read_text()); record['library'] = str(tmp_path/'foreign/mentor.lmc')
marker.write_text(json.dumps(record))
monkeypatch.setattr(ui, 'preflight_skip_reason', lambda *a: None)
calls = []
window = MainWindow(reader=lambda *a: LibraryReadResult((CbbRecord('IP101GR', 'Reusable Blocks', status='PENDING'),)),
verifier=lambda req: (calls.append(req) or VerifyResult('BLOCKED', safe_to_continue=False)),
status_refresher=lambda *a: {'IP101GR': 'PENDING'}, data_root=tmp_path/'data')
qtbot.addWidget(window)
window.lmc_edit.setText(str(library)); window.load_library()
qtbot.waitUntil(lambda: not window.busy)
assert window.release_library_button.isEnabled()
assert window.visible_records()[0].name == 'IP101GR'
assert window.visible_records()[0].status == 'PENDING'
assert not window._maintenance_recovery_view
window.select_visible_button.click()
assert window.icdb_repair_button.isEnabled()
assert window.batch_button.isEnabled() and window.selected_batch_button.isEnabled()
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
window.verify_selected(); qtbot.waitUntil(lambda: not window.busy)
assert len(calls) == 1 and calls[0].maintenance is False
assert window.selected_batch_button.isEnabled()
window.repair_icdb_all(); qtbot.waitUntil(lambda: not window._icdb_active())
assert len(calls) == 2 and calls[1].maintenance is True
assert marker.exists()
def test_maintenance_summary_exposes_first_failure_reason(qtbot, tmp_path):
from cbb_refresh_verify.ui.main_window import MainWindow
from cbb_refresh_verify.verify_runner import VerifyResult
window = MainWindow(data_root=tmp_path)
qtbot.addWidget(window)
window._global_icdb_run = True
detail = 'MAINTENANCE_TARGET_UNCONFIRMED: PCB 引用与当前工程不一致'
window._batch_done(([VerifyResult('BLOCKED', stderr=detail, safe_to_continue=False)], tmp_path/'batch.log'))
assert detail in window.summary.detailedText()
assert detail in window.output.toPlainText()
assert detail not in window.summary.text()
assert str(tmp_path) not in window.summary.text()
assert detail not in window.status_label.text()
assert '无法确认 1' in window.summary.text()
def test_open_check_preserves_verify_state_without_starting_an_extra_catalog_read(qtbot, tmp_path, monkeypatch):
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path, _owners, _guard
from cbb_refresh_verify.ui.main_window import MainWindow
from cbb_refresh_verify.models import LibraryReadResult, CbbRecord
from cbb_refresh_verify.verify_runner import VerifyResult
import cbb_refresh_verify.ui.main_window as ui
library = tmp_path/'library/mentor.lmc'; library.parent.mkdir(); library.touch()
(library.parent/'ReusableBlocksLP/IP101GR').mkdir(parents=True)
with LibraryLock(library, safe_to_release=lambda: False) as lease: pass
with _guard:
owner = _owners.pop(lease.key, None)
if owner: owner['handle'].Close()
reads = []
def reader(path):
reads.append(path)
return LibraryReadResult((CbbRecord('IP101GR', 'Reusable Blocks', status='PENDING'),))
def verify(req):
assert req.maintenance
blocker_path(library).unlink() # Simulate normal cleanup at the injected boundary.
return VerifyResult('CHECKED')
monkeypatch.setattr(ui, 'preflight_skip_reason', lambda *a: None)
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
window = MainWindow(reader=reader, verifier=verify, data_root=tmp_path/'data',
status_refresher=lambda *a: pytest.fail('An open check must not start a second native status read'))
qtbot.addWidget(window)
window.lmc_edit.setText(str(library)); window.load_library(); qtbot.waitUntil(lambda: not window.busy)
assert len(reads) == 1
window.search_edit.setText('IP101')
window.repair_icdb_all()
qtbot.waitUntil(lambda: not window._icdb_active())
assert window.visible_records()[0].status == 'PENDING' and len(reads) == 1
assert not window._maintenance_recovery_view and window.search_edit.text() == 'IP101'
import json
from pathlib import Path
import pytest
from PySide6.QtCore import Qt
from PySide6.QtWidgets import QMessageBox
def test_only_confirmed_maintenance_sets_explicit_flag(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
calls = []
window = load_window(qtbot, tmp_path, monkeypatch,
verifier=lambda req: (calls.append(req) or VerifyResult('FAIL', safe_to_continue=True)),
status_refresher=lambda names, path: {name: 'PENDING' for name in names})
window.search_edit.setText('Beta')
window.verify_all(); qtbot.waitUntil(lambda: not window.busy)
assert calls and calls[-1].maintenance is False
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.No)
window.repair_icdb_all(); assert len(calls) == 1
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
window.repair_icdb_all(); qtbot.waitUntil(lambda: not window.busy)
assert len(calls) == 2 and calls[-1].maintenance is True
@pytest.mark.parametrize('marker_kind', ['valid', 'foreign', 'malformed'])
def test_old_checkpoint_does_not_force_maintenance_or_disable_verify(qtbot, tmp_path, monkeypatch, marker_kind):
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path, _owners, _guard
from cbb_refresh_verify.ui.main_window import MainWindow
from cbb_refresh_verify.verify_runner import VerifyResult
from cbb_refresh_verify.models import LibraryReadResult, CbbRecord
import cbb_refresh_verify.ui.main_window as ui
library = tmp_path/'library/mentor.lmc'; library.parent.mkdir(); library.touch()
(library.parent/'ReusableBlocksLP/IP101GR').mkdir(parents=True)
with LibraryLock(library, safe_to_release=lambda: False) as lock: pass
with _guard:
owner = _owners.pop(lock.key, None)
if owner: owner['handle'].Close()
marker = blocker_path(library)
if marker_kind == 'malformed': marker.write_text('{}')
if marker_kind == 'foreign':
record = json.loads(marker.read_text()); record['library'] = str(tmp_path/'foreign/mentor.lmc')
marker.write_text(json.dumps(record))
monkeypatch.setattr(ui, 'preflight_skip_reason', lambda *a: None)
calls = []
window = MainWindow(reader=lambda *a: LibraryReadResult((CbbRecord('IP101GR', 'Reusable Blocks', status='PENDING'),)),
verifier=lambda req: (calls.append(req) or VerifyResult('BLOCKED', safe_to_continue=False)),
status_refresher=lambda *a: {'IP101GR': 'PENDING'}, data_root=tmp_path/'data')
qtbot.addWidget(window)
window.lmc_edit.setText(str(library)); window.load_library()
qtbot.waitUntil(lambda: not window.busy)
assert window.release_library_button.isEnabled()
assert window.visible_records()[0].name == 'IP101GR'
assert window.visible_records()[0].status == 'PENDING'
assert not window._maintenance_recovery_view
window.select_visible_button.click()
assert window.icdb_repair_button.isEnabled()
assert window.batch_button.isEnabled() and window.selected_batch_button.isEnabled()
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
window.verify_selected(); qtbot.waitUntil(lambda: not window.busy)
assert len(calls) == 1 and calls[0].maintenance is False
assert window.selected_batch_button.isEnabled()
window.repair_icdb_all(); qtbot.waitUntil(lambda: not window.busy)
assert len(calls) == 2 and calls[1].maintenance is True
assert marker.exists()
def test_maintenance_summary_exposes_first_failure_reason(qtbot, tmp_path):
from cbb_refresh_verify.ui.main_window import MainWindow
from cbb_refresh_verify.verify_runner import VerifyResult
window = MainWindow(data_root=tmp_path)
qtbot.addWidget(window)
window._global_icdb_run = True
detail = 'MAINTENANCE_TARGET_UNCONFIRMED: PCB 引用与当前工程不一致'
window._batch_done(([VerifyResult('BLOCKED', stderr=detail, safe_to_continue=False)], tmp_path/'batch.log'))
assert detail in window.summary.detailedText()
assert detail in window.output.toPlainText()
assert detail not in window.summary.text()
assert str(tmp_path) not in window.summary.text()
assert detail not in window.status_label.text()
assert '无法确认 1' in window.summary.text()
def test_safe_maintenance_reloads_authoritative_catalog_after_worker_finishes(qtbot, tmp_path, monkeypatch):
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path, _owners, _guard
from cbb_refresh_verify.ui.main_window import MainWindow
from cbb_refresh_verify.models import LibraryReadResult, CbbRecord
from cbb_refresh_verify.verify_runner import VerifyResult
import cbb_refresh_verify.ui.main_window as ui
library = tmp_path/'library/mentor.lmc'; library.parent.mkdir(); library.touch()
(library.parent/'ReusableBlocksLP/IP101GR').mkdir(parents=True)
with LibraryLock(library, safe_to_release=lambda: False) as lease: pass
with _guard:
owner = _owners.pop(lease.key, None)
if owner: owner['handle'].Close()
reads = []
def reader(path):
reads.append(path)
return LibraryReadResult((CbbRecord('IP101GR', 'Reusable Blocks', status='PENDING'),))
def verify(req):
assert req.maintenance
blocker_path(library).unlink() # Simulate normal cleanup at the injected boundary.
return VerifyResult('PASS', library_flag='GREEN')
monkeypatch.setattr(ui, 'preflight_skip_reason', lambda *a: None)
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
window = MainWindow(reader=reader, verifier=verify, data_root=tmp_path/'data',
status_refresher=lambda *a: {'IP101GR': 'READY'})
qtbot.addWidget(window)
window.lmc_edit.setText(str(library)); window.load_library(); qtbot.waitUntil(lambda: not window.busy)
assert len(reads) == 1
window.search_edit.setText('IP101')
window.repair_icdb_all()
qtbot.waitUntil(lambda: not window.busy)
assert window.visible_records()[0].status == 'READY'
assert not window._maintenance_recovery_view and window.search_edit.text() == 'IP101'
+3 -3
View File
@@ -162,7 +162,7 @@ def test_update_failed_readd_keeps_removed_checkpoint_and_baseline(setup):
request, adapter, source = setup
adapter.fail_add = True
result = execute(replace(request, operation='update', source=source), adapter)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
assert result.status == 'RECOVERY_REQUIRED' and not result.safe_to_continue
assert adapter.records == []
history = json.loads(result.evidence_path.read_text(encoding='utf-8'))['history']
assert 'removed' in [x['stage'] for x in history]
@@ -177,7 +177,7 @@ def test_lying_native_output_does_not_report_success(setup, operation):
request = replace(request, operation=operation, source=source,
name='New' if operation == 'add' else 'Block')
result = execute(request, adapter)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
assert result.status == 'RECOVERY_REQUIRED' and not result.safe_to_continue
def test_unreleased_native_owner_prevents_postread_and_verification(setup):
@@ -265,7 +265,7 @@ def test_replaced_source_bytes_fail_identity_even_with_same_name(setup):
return result
adapter.add = wrong_source
result = execute(replace(request, operation='add', name='New', source=source), adapter)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
assert result.status == 'RECOVERY_REQUIRED' and not result.safe_to_continue
def test_update_success_requires_same_identity_and_no_implicit_partition_move(setup):
+2 -4
View File
@@ -107,8 +107,7 @@ def test_native_registered_but_asset_mismatch_retains_recovery(transaction, corr
root, request, state = transaction
state['corrupt'] = corrupt
result = execute(root, request)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
assert execute(root, request).status == 'BLOCKED'
assert result.status == 'RECOVERY_REQUIRED' and not result.safe_to_continue
def test_update_readd_failure_preserves_baseline_and_removed_checkpoint(transaction):
@@ -116,8 +115,7 @@ def test_update_readd_failure_preserves_baseline_and_removed_checkpoint(transact
assert execute(root, request).status == 'UPLOADED'
state['fail_add'] = True
result = execute(root, replace(request, operation='update'))
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
assert execute(root, replace(request, operation='update')).status == 'BLOCKED'
assert result.status == 'RECOVERY_REQUIRED' and not result.safe_to_continue
assert (result.evidence_path.parent/'library-baseline-manifest.json').exists()
assert not (result.evidence_path.parent/'library-before').exists()
assert 'removed' in [entry['stage'] for entry in json.loads(result.evidence_path.read_text())['history']]
-585
View File
@@ -1,585 +0,0 @@
"""Retry boundaries use fake native outcomes and temporary libraries only."""
import json
import os
from pathlib import Path
from types import SimpleNamespace
import pytest
from test_management import setup, execute
from test_management_native_transaction import transaction
@pytest.fixture
def isolated_mutex(monkeypatch):
import win32event
from uuid import uuid4
original = win32event.CreateMutex
suffix = uuid4().hex
monkeypatch.setattr(win32event, 'CreateMutex', lambda security, owned, name:
original(security, owned, name + suffix))
def test_released_catalog_failure_does_not_retain_management_lease(setup, monkeypatch):
from cbb_refresh_verify.native_management import NativeManagementAdapter
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path
request, _, _ = setup
adapter = NativeManagementAdapter(mentor_home=request.library.parent)
monkeypatch.setattr(adapter, 'capabilities', lambda: {'remove': SimpleNamespace(supported=True)})
monkeypatch.setattr(adapter, '_worker', lambda *_: {
'success': False, 'safe_to_continue': True, 'detail': 'catalog read failed after exit'})
result = execute(request, adapter)
assert result.safe_to_continue
assert not blocker_path(request.library).exists()
with LibraryLock(request.library):
pass
@pytest.mark.parametrize('busy', [False, True])
def test_legacy_blocker_is_rechecked_before_management_without_inventing_new_owner(setup, monkeypatch, isolated_mutex, busy):
import cbb_refresh_verify.library_lock as locks
request, adapter, _ = setup
marker = locks.blocker_path(request.library)
legacy = {'protocol': 'cbb-refresh-verify-library-lease', 'version': 1,
'lease_id': 'eae80a06f23e4664b00c70b6bf81b01d', 'library': str(request.library),
'status': 'OWNER_RELEASE_UNCONFIRMED', 'pid': 57076, 'time': '2026-11-04T09:43:50.830958+00:00'}
marker.write_text(json.dumps(legacy), encoding='utf-8')
before = marker.read_bytes()
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
address = request.library.parent/'database/cdbsvr/sAddress.adr'
if busy:
address.parent.mkdir(parents=True); address.write_bytes(b'actual address')
result = execute(request, adapter)
assert result.safe_to_continue, 'No new native session was started by a blocked release check'
assert result.evidence_path and result.evidence_path.is_file()
if busy:
assert result.status == 'BLOCKED' and adapter.calls == []
assert marker.read_bytes() == before and address.read_bytes() == b'actual address'
assert '地址' in result.detail
else:
assert result.status == 'REMOVED' and adapter.calls == ['remove']
assert result.release_proof['status'] == 'RELEASE_CONFIRMED'
archive = Path(result.release_proof['evidence_path']).with_name('blocker-before-0.json')
assert archive.read_bytes() == before and not marker.exists()
def test_busy_execution_channel_does_not_create_unreleased_management_owner(setup, monkeypatch):
import win32con, win32event
request, adapter, _ = setup
monkeypatch.setattr(win32event, 'WaitForSingleObject', lambda *_: win32con.WAIT_TIMEOUT)
result = execute(request, adapter)
assert result.status == 'BLOCKED' and result.safe_to_continue and not adapter.calls
assert result.evidence_path.is_file()
def test_management_rechecks_retained_verify_lease_without_checkpoint(setup, monkeypatch, isolated_mutex):
import cbb_refresh_verify.library_lock as locks
from cbb_refresh_verify.residual_sessions import inspect_residual_sessions
request, adapter, _ = setup
with locks.LibraryLock(request.library, checkpoint=False, safe_to_release=lambda: False):
pass
assert not locks.blocker_path(request.library).exists()
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
monkeypatch.setattr('cbb_refresh_verify.residual_sessions.query_process_snapshot', lambda: [])
preview = inspect_residual_sessions(request.library)
assert preview['sessions'] == [] and any(r.get('kind') == 'in_memory' for r in preview['previous_records'])
result = execute(request, adapter)
assert result.status == 'REMOVED' and result.release_proof['status'] == 'RELEASE_CONFIRMED'
assert not locks.has_retained_library(request.library)
def test_management_worker_prelaunch_failure_is_safe(tmp_path, monkeypatch):
import cbb_refresh_verify.native_management as native
job = tmp_path/'request.json'
job.write_text(json.dumps({'operation': 'catalog', 'desktop': 'CbbManagement_test',
'library': str(tmp_path/'lib.lmc')}), encoding='utf-8')
monkeypatch.setattr(native, '_current_desktop', lambda: (None, 'wrong desktop'))
assert native.management_worker_main(job) == 2
result = json.loads((tmp_path/'result.json').read_text('utf-8'))
assert result['safe_to_continue'] is True
@pytest.mark.parametrize('code,busy', [(5, False), (32, True), (33, True)])
def test_coordination_open_error_preserves_access_failure(tmp_path, monkeypatch, code, busy):
import pywintypes
import win32file
from cbb_refresh_verify.library_lock import LibraryLock, LibraryBusy
def denied(*_):
raise pywintypes.error(code, 'CreateFile', 'test failure')
monkeypatch.setattr(win32file, 'CreateFile', denied)
with pytest.raises((OSError, pywintypes.error)) as error:
with LibraryLock(tmp_path/'lib.lmc'):
pass
assert isinstance(error.value, LibraryBusy) is busy
def test_retained_checkpoint_lease_can_reprobe_exact_release(tmp_path):
import cbb_refresh_verify.library_lock as locks
library = tmp_path/'lib.lmc'; library.touch()
released = False
lease = locks.LibraryLock(library, safe_to_release=lambda: released)
try:
with lease:
pass
with pytest.raises(locks.LibraryBusy):
with locks.LibraryLock(library):
pass
released = True
with locks.LibraryLock(library):
pass
assert not locks.blocker_path(library).exists()
finally:
owner = locks._owners.pop(lease.key, None)
if owner:
owner['handle'].Close()
@pytest.mark.parametrize('failure', ['enumerate', 'cancel'])
def test_owned_mapping_close_retries_after_transient_failure(monkeypatch, failure):
from test_network_path import FakeWNet
from cbb_refresh_verify.network_path import LibraryPathLease, NetworkPathError
backend = FakeWNet()
lease = LibraryPathLease.acquire(r'\\server\share\lib.lmc', backend=backend)
method = 'mappings' if failure == 'enumerate' else 'cancel_mapping'
original = getattr(backend, method)
def broken(*_):
raise OSError('temporary disconnect')
monkeypatch.setattr(backend, method, broken)
with pytest.raises(NetworkPathError):
lease.close()
monkeypatch.setattr(backend, method, original)
lease.close()
assert backend.cancelled == [lease.drive]
def test_batch_mismatch_isolated_to_item(tmp_path):
from cbb_refresh_verify.batch_status import BatchStatusSession
from cbb_refresh_verify.status_bridge import BridgeResponseError, BridgeResult
library = tmp_path/'lib.lmc'; library.touch()
class Bridge:
def __init__(self): self.calls = []; self.restarts = 0
def start(self): pass
def close(self): pass
def restart(self): self.restarts += 1
def query(self, library, name, **kwargs):
self.calls.append(name)
if name == 'Bad': raise BridgeResponseError('CBB mismatch')
return BridgeResult('PENDING', 'test')
bridge = Bridge()
results = BatchStatusSession(bridge).scan(['Bad', 'Good'], library, tmp_path/'scan.jsonl')
assert [result.status for result in results] == ['MALFORMED', 'PENDING']
assert bridge.calls == ['Bad', 'Good'] and bridge.restarts == 1
def test_batch_cache_binds_exact_library_identity(tmp_path):
from cbb_refresh_verify.batch_status import fingerprint_library
first = tmp_path/'a/lib.lmc'; first.parent.mkdir(); first.write_bytes(b'same')
second = tmp_path/'b/lib.lmc'; second.parent.mkdir(); second.write_bytes(b'same')
stat = first.stat(); os.utime(second, ns=(stat.st_atime_ns, stat.st_mtime_ns))
assert fingerprint_library(first).sha256 != fingerprint_library(second).sha256
def test_timed_out_management_worker_releases_only_after_its_result(tmp_path, monkeypatch):
import cbb_refresh_verify.native_management as native
state = {'exit': None}
worker = SimpleNamespace(poll=lambda: state['exit'], close=lambda: None)
adapter = native.NativeManagementAdapter(mentor_home=tmp_path, worker_factory=lambda *_: worker)
library = tmp_path/'lib.lmc'; library.touch()
evidence = tmp_path/'run'; evidence.mkdir()
result = adapter._launch_worker({'library': str(library), 'operation': 'catalog',
'desktop': 'CbbManagement_test', 'timeout_seconds': 0}, evidence)
try:
assert result['safe_to_continue'] is False
assert adapter.release_confirmed(library) is False
state['exit'] = 2
assert adapter.release_confirmed(library) is False
(evidence/'result.json').write_text(json.dumps({'success': False, 'safe_to_continue': True}))
assert adapter.release_confirmed(tmp_path/'other.lmc') is False
assert adapter.release_confirmed(library) is True
assert worker not in native._retained_workers
finally:
if worker in native._retained_workers:
native._retained_workers.remove(worker)
def test_existing_library_manager_refusal_preserves_prelaunch_release(tmp_path, monkeypatch):
import cbb_refresh_verify.native_management as native
monkeypatch.setattr(native, '_current_desktop', lambda: (None, 'CbbManagement_test'))
monkeypatch.setattr('cbb_refresh_verify.mentor_adapter._process_details', lambda *_: [(123, 'other')])
with pytest.raises(RuntimeError) as error:
native._catalog_native({'operation': 'catalog', 'desktop': 'CbbManagement_test'}, tmp_path)
assert error.value.safe_to_continue is True
@pytest.mark.parametrize('stage,expected', [('catalog_before', 'REMOVED'), ('native_remove', 'BLOCKED')])
def test_prewrite_failure_evidence_does_not_permanently_prevent_retry(setup, stage, expected):
request, adapter, _ = setup
checkpoint = request.evidence_dir/'interrupted/checkpoint.json'
checkpoint.parent.mkdir(parents=True)
checkpoint.write_text(json.dumps({'library': str(request.library), 'stage': 'complete',
'status': 'BLOCKED', 'safe_to_continue': False, 'history': [{'stage': stage}]}), encoding='utf-8')
result = execute(request, adapter)
assert result.status == expected
def test_scoped_release_includes_shared_database_addresses(tmp_path, monkeypatch):
import cbb_refresh_verify.library_lock as locks
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
library = tmp_path/'lib.lmc'; library.touch()
address = tmp_path/'SymbolLibs/__ReusableBlocksSymb/cdbsvr/sAddress.adr'
address.parent.mkdir(parents=True); address.write_bytes(b'preserve shared native address')
with pytest.raises(locks.LibraryBusy):
with locks._prove_library_released(library, block_name='Target'):
pass
assert address.read_bytes() == b'preserve shared native address'
def test_valid_relocated_pending_checkpoint_does_not_block_snapshot(tmp_path):
import cbb_refresh_verify.library_lock as locks
library = tmp_path/'copy/lib.lmc'; library.parent.mkdir(); library.touch()
pending = locks.blocker_path(library).with_suffix('.pending')
pending.write_text(json.dumps({'protocol': 'cbb-refresh-verify-library-lease', 'version': 1,
'library': str(tmp_path/'source/lib.lmc'), 'pid': os.getpid(),
'status': 'OPERATION_IN_PROGRESS', 'lease_id': 'a'*32, 'time': '2026-11-05'}))
assert not locks.has_blocker(library)
@pytest.mark.parametrize('content', ['{torn json', '{"unrecognized":"metadata"}'])
def test_unknown_checkpoint_release_archives_only_after_full_fresh_proof(tmp_path, monkeypatch, content):
import cbb_refresh_verify.library_lock as locks
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
monkeypatch.setattr('cbb_refresh_verify.native_engineering_identity._process_snapshot', lambda: [])
library = tmp_path/'library/lib.lmc'; library.parent.mkdir(); library.touch()
marker = locks.blocker_path(library); marker.write_text(content)
result = locks.release_retained_library(library, tmp_path/'evidence', block_name='Target')
assert result['status'] == 'RELEASE_CONFIRMED'
assert Path(result['evidence_path']).with_name('blocker-before-0.json').read_text() == content
assert not marker.exists()
assert library.with_name('.lib.cbb-upload.lock').exists()
def test_unknown_checkpoint_cannot_use_selected_target_to_ignore_other_owners(tmp_path, monkeypatch):
import cbb_refresh_verify.library_lock as locks
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
monkeypatch.setattr('cbb_refresh_verify.native_engineering_identity._process_snapshot', lambda: [])
library = tmp_path/'library/lib.lmc'; library.parent.mkdir(); library.touch()
marker = locks.blocker_path(library); marker.write_bytes(b'{torn checkpoint')
address = library.parent/'ReusableBlocksLP/Other/Work/database/cdbsvr/sAddress.adr'
address.parent.mkdir(parents=True); address.write_bytes(b'preserve owner record')
with pytest.raises(locks.LibraryBusy):
locks.release_retained_library(library, tmp_path/'evidence', block_name='Target')
assert marker.read_bytes() == b'{torn checkpoint'
assert address.read_bytes() == b'preserve owner record'
def test_status_cache_does_not_reuse_a_different_block_type(tmp_path):
from cbb_refresh_verify.batch_status import BatchStatusSession
from cbb_refresh_verify.status_bridge import BridgeResult
library = tmp_path/'lib.lmc'; library.touch()
calls = []
class Bridge:
def query(self, library, name, **kwargs):
calls.append(kwargs['block_type'])
return BridgeResult('READY', 'test')
session = BatchStatusSession(Bridge())
session.scan(['Block'], library, tmp_path/'scan.jsonl', block_type='RULP')
session.scan(['Block'], library, tmp_path/'scan.jsonl', block_type='Other', resume=True)
assert calls == ['RULP', 'Other']
@pytest.mark.parametrize('case,relevant', [('other', False), ('prefix', False),
('target', True), ('shared', True), ('worker_target', True), ('worker_other', False)])
def test_release_owner_scope_uses_exact_paths_and_bound_worker_request(tmp_path, monkeypatch, case, relevant):
import cbb_refresh_verify.library_lock as locks
library = tmp_path/'library/lib.lmc'; library.parent.mkdir(); library.touch()
target = library.parent/'ReusableBlocksLP/Target/Work'
locations = {'other': tmp_path/'other/Other.prj', 'prefix': target.with_name('WorkOld')/'Other.prj',
'target': target/'Target.prj', 'shared': library.parent/'SymbolLibs/shared/database'}
if case.startswith('worker_'):
job = tmp_path/'worker.json'
job.write_text(json.dumps({'library': str(library if case == 'worker_target' else tmp_path/'other/lib.lmc')}))
name, command = 'python.exe', f'python.exe --management-worker "{job}"'
else:
name, command = 'ExpeditionPCB.exe', f'ExpeditionPCB.exe -project="{locations[case]}"'
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [
{'pid': 123456, 'name': name, 'command': command, 'parent': 0}])
if relevant:
with pytest.raises(locks.LibraryBusy):
with locks._prove_library_released(library, block_name='Target'):
pass
else:
with locks._prove_library_released(library, block_name='Target'):
pass
def test_release_ignores_retained_management_worker_for_other_library(tmp_path, monkeypatch):
import cbb_refresh_verify.library_lock as locks
import cbb_refresh_verify.native_management as native
library = tmp_path/'lib.lmc'; library.touch()
other = SimpleNamespace(poll=lambda: None, cbb_library=str(tmp_path/'other.lmc'))
monkeypatch.setattr(native, '_retained_workers', [other])
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
with locks._prove_library_released(library):
pass
def test_retained_mapping_can_close_after_exact_release_proof():
from test_network_path import FakeWNet
from cbb_refresh_verify.network_path import LibraryPathLease
backend = FakeWNet()
lease = LibraryPathLease.acquire(r'\\server\share\lib.lmc', backend=backend)
lease.retain_for_recovery()
lease.close()
assert backend.cancelled == []
assert not lease.release_after_recovery({'status': 'RELEASE_CONFIRMED', 'library': r'\\other\share\lib.lmc'})
assert lease.release_after_recovery({'status': 'RELEASE_CONFIRMED', 'library': r'\\server\share\lib.lmc'})
lease.close()
assert backend.cancelled == [lease.drive]
def test_target_mapping_query_ignores_unrelated_enumeration_failure():
from test_network_path import FakeWNet
from cbb_refresh_verify.network_path import ensure_mapped_drive_visible
class Backend(FakeWNet):
def mapping(self, drive):
assert drive == 'S:'
return r'\\server\share'
def mappings(self):
raise OSError('unrelated drive enumeration failed')
result = ensure_mapped_drive_visible('S:', r'\\server\share', backend=Backend())
assert result['created'] is False
def test_windows_mapping_enumeration_reserves_unavailable_drive():
from cbb_refresh_verify.network_path import WindowsWNetBackend
backend = WindowsWNetBackend.__new__(WindowsWNetBackend)
def connection(drive, buffer, size):
if drive == 'D:': return 5
if drive == 'Y:':
buffer.value = r'\\server\share'
return 0
return 2250
backend._mpr = SimpleNamespace(WNetGetConnectionW=connection)
backend._kernel32 = SimpleNamespace(GetLogicalDrives=lambda: 0)
assert backend.mappings() == {'Y:': r'\\server\share'}
assert 'D:' in backend.used_drives()
def test_postnative_idle_failure_preserves_known_release(setup, isolated_mutex):
from cbb_refresh_verify.management import run_management
from cbb_refresh_verify.library_lock import LibraryLock
request, adapter, _ = setup
checks = []
def idle(*_):
checks.append(1)
if len(checks) == 3:
raise OSError('passive owner query unavailable after native exit')
result = run_management(request, adapter=adapter, idle_check=idle)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
with LibraryLock(request.library):
pass
def test_final_report_failure_does_not_discard_release_result(setup, monkeypatch, isolated_mutex):
import cbb_refresh_verify.management as management
request, adapter, _ = setup
original = management._write_json
def write(path, record):
if record.get('stage') == 'complete':
raise OSError('evidence volume unavailable')
return original(path, record)
monkeypatch.setattr(management, '_write_json', write)
result = execute(request, adapter)
assert result.status == 'REMOVED' and result.safe_to_continue
assert 'evidence volume unavailable' in result.detail
def test_legacy_checkpoint_cannot_clear_other_target_owner(tmp_path, monkeypatch, isolated_mutex):
import cbb_refresh_verify.library_lock as locks
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
library = tmp_path/'library/lib.lmc'; library.parent.mkdir(); library.touch()
marker = locks.blocker_path(library)
locks._persist_blocker(library, lease_id='b'*32)
original = marker.read_bytes()
address = library.parent/'ReusableBlocksLP/Other/Work/database/cdbsvr/sAddress.adr'
address.parent.mkdir(parents=True); address.write_bytes(b'keep actual owner address')
with pytest.raises(locks.LibraryBusy):
locks.release_retained_library(library, tmp_path/'evidence', block_name='Target')
assert marker.read_bytes() == original
assert address.read_bytes() == b'keep actual owner address'
def test_release_proof_recovers_old_mapping_lease_and_transfers_shared_drive():
import cbb_refresh_verify.network_path as network
from test_network_path import FakeWNet
backend = FakeWNet()
old = network.LibraryPathLease.acquire(r'\\server\share\A\lib.lmc', backend=backend)
current = network.LibraryPathLease.acquire(r'\\server\share\B\lib.lmc', backend=backend)
old.retain_for_recovery(); old.close()
proof = {'status': 'RELEASE_CONFIRMED', 'library': r'\\server\share\A\lib.lmc'}
assert network.release_retained_path_leases(proof, current_lease=current) == 1
assert backend.cancelled == [] and current.created
current.close()
assert backend.cancelled == [current.drive]
def test_clean_failed_mutation_keeps_recovery_requirement_and_released_owner(setup, isolated_mutex):
from dataclasses import replace
from cbb_refresh_verify.management import run_management
request, adapter, source = setup
adapter.fail_add = True
failed = execute(replace(request, operation='update', source=source, auto_verify=False), adapter)
assert failed.status == 'RECOVERY_REQUIRED' and failed.safe_to_continue
adapter.fail_add = False
same = execute(replace(request, operation='add', source=source, auto_verify=False), adapter)
assert same.status == 'BLOCKED'
other = execute(replace(request, operation='add', name='Independent', source=source, auto_verify=False), adapter)
assert other.status == 'UPLOADED' and other.safe_to_continue
@pytest.mark.parametrize('history', [None, [], [{'stage': 'native_remove'}, {'stage': 'prepare_identity'}]])
def test_prewrite_stage_alone_does_not_override_unknown_or_mutated_history(history):
from cbb_refresh_verify.management import _may_have_mutated
record = {'stage': 'prepare_identity', 'history': history, 'status': 'RUNNING'}
assert _may_have_mutated(record)
def test_library_checkpoint_binds_supervisor_creation_identity(tmp_path):
import cbb_refresh_verify.library_lock as locks
library = tmp_path/'lib.lmc'; library.touch()
locks._persist_blocker(library, lease_id='c'*32)
record = json.loads(locks.blocker_path(library).read_text())
assert record.get('supervisor_created')
assert locks._recorded_supervisor_alive(record) is True
assert locks._recorded_supervisor_alive({**record, 'supervisor_created': 'other process'}) is False
legacy = {key: value for key, value in record.items() if key not in ('machine', 'supervisor_created')}
assert locks._recorded_supervisor_alive(legacy) is None
@pytest.mark.parametrize('proof,safe', [
({'safe_to_continue': True, 'process_created': False, 'worker_exited': True, 'remaining_pids': []}, True),
({'safe_to_continue': True, 'process_created': True, 'worker_exited': True, 'remaining_pids': []}, False),
({'safe_to_continue': True, 'process_created': False, 'worker_exited': False, 'remaining_pids': []}, False),
(None, False)])
def test_management_worker_launch_exception_uses_explicit_release_protocol(tmp_path, proof, safe):
from cbb_refresh_verify.native_management import NativeManagementAdapter
error = OSError('private desktop creation failed')
error.worker_launch_release = proof
def fail(*_): raise error
adapter = NativeManagementAdapter(mentor_home=tmp_path, worker_factory=fail)
with pytest.raises(OSError) as caught:
adapter._launch_worker({'library': str(tmp_path/'lib.lmc'), 'operation': 'catalog',
'desktop': 'CbbManagement_test', 'timeout_seconds': 1}, tmp_path)
assert getattr(caught.value, 'safe_to_continue', None) is safe
def test_native_add_passive_postcheck_failure_preserves_release(transaction, monkeypatch, isolated_mutex):
from test_management_native_transaction import execute as execute_transaction
root, request, state = transaction
def unavailable(*_): raise OSError('passive target check unavailable')
monkeypatch.setattr('cbb_refresh_verify.backup_recovery._idle_check', unavailable)
result = execute_transaction(root, request)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
@pytest.mark.parametrize('case,safe', [('exit_output_error', True), ('popen_missing', True),
('popen_denied', True), ('popen_unknown', False), ('timeout', False)])
def test_remove_worker_preserves_exit_and_known_creation_rejection(tmp_path, monkeypatch, case, safe):
import cbb_refresh_verify.native_management as native
job = tmp_path/'request.json'
job.write_text(json.dumps({'operation': 'remove', 'desktop': 'CbbManagement_test',
'mentor_home': str(tmp_path), 'library': str(tmp_path/'lib.lmc'), 'name': 'Block',
'partition': 'Logical-Physical', 'timeout_seconds': 1}), encoding='utf-8')
monkeypatch.setattr(native, '_current_desktop', lambda: (None, 'CbbManagement_test'))
monkeypatch.setattr(native.NativeManagementAdapter, 'capabilities', lambda _: {
'remove': SimpleNamespace(supported=True)})
observed = {'waited': False}
def wait(timeout):
if case == 'timeout':
raise native.subprocess.TimeoutExpired('fake CleanWGLib', timeout)
observed['waited'] = True
return 0
def popen(*args, **kwargs):
failures = {'popen_missing': FileNotFoundError('native binary disappeared'),
'popen_denied': PermissionError('native creation denied'),
'popen_unknown': OSError('unconfirmed process creation')}
if case in failures:
raise failures[case]
return SimpleNamespace(pid=123456, wait=wait)
monkeypatch.setattr(native.subprocess, 'Popen', popen)
original_read = Path.read_bytes
def read(path):
if path.name == 'native-output.txt' and case == 'exit_output_error':
assert observed['waited']
raise OSError('native output storage unavailable after exit')
return original_read(path)
monkeypatch.setattr(Path, 'read_bytes', read)
assert native.management_worker_main(job) == 2
result = json.loads((tmp_path/'result.json').read_text('utf-8'))
assert result['safe_to_continue'] is safe
if case == 'exit_output_error':
assert result['exit_code'] == 0 and 'storage unavailable' in result['detail']
def test_add_source_missing_central_library_fails_before_capture_without_retaining(setup, monkeypatch, isolated_mutex):
from dataclasses import replace
import cbb_refresh_verify.native_management as native
from cbb_refresh_verify.management import Catalog
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path
request, _, source = setup
adapter = native.NativeManagementAdapter(mentor_home=source.parent)
monkeypatch.setattr(adapter, 'capabilities', lambda: {'add': SimpleNamespace(supported=True)})
monkeypatch.setattr(adapter, 'catalog', lambda library, evidence: Catalog(library, 1, ()))
monkeypatch.setattr('cbb_refresh_verify.native_engineering_identity.capture_identity',
lambda *_a, **_kw: pytest.fail('incomplete source reached native capture'))
result = execute(replace(request, operation='add', name='New', source=source, auto_verify=False), adapter)
assert result.status == 'UPLOAD_FAILED' and result.safe_to_continue
assert 'CentralLibrary' in result.detail
assert not blocker_path(request.library).exists()
with LibraryLock(request.library):
pass
def test_prepared_transaction_storage_failure_preserves_capture_release(transaction, monkeypatch, isolated_mutex):
from test_management_native_transaction import execute as execute_transaction
root, request, _ = transaction
def unavailable(*_a, **_kw): raise OSError('prepared transaction storage unavailable')
monkeypatch.setattr('cbb_refresh_verify.management_transaction.prepare_transaction', unavailable)
result = execute_transaction(root, request)
assert result.status == 'UPLOAD_FAILED' and result.safe_to_continue
assert 'prepared transaction storage unavailable' in result.detail
@pytest.mark.parametrize('flag,relevant', [('-icdb', False), ('-icdb=', False),
('-ICDB', True), ('-icdb=', True)])
def test_release_owner_scope_parses_actual_edif_database_argument(tmp_path, flag, relevant):
from cbb_refresh_verify.library_lock import _owner_matches_scope
library = tmp_path/'Target/lib.lmc'
database = library.parent/'Work/database'
selected = database if relevant else tmp_path/'Other project/database'
argument = flag + ('' if flag.endswith('=') else ' ') + f'"{selected}"'
item = {'command': f'edifExporter.exe -schematic {argument} -isnap DxD'}
assert _owner_matches_scope(item, library, (database,)) is relevant
def test_release_owner_scope_does_not_match_edif_database_prefix(tmp_path):
from cbb_refresh_verify.library_lock import _owner_matches_scope
database = tmp_path/'Target/database'
item = {'command': f'edifExporter.exe -schematic -icdb "{database}_old" -isnap DxD'}
assert _owner_matches_scope(item, tmp_path/'Target/lib.lmc', (database,)) is False
def test_same_target_recovery_gate_preserves_release_and_batch_continues(setup, isolated_mutex):
from dataclasses import replace
from cbb_refresh_verify.management import run_management_batch
request, adapter, source = setup
adapter.fail_add = True
failed = execute(replace(request, operation='update', source=source, auto_verify=False), adapter)
assert failed.status == 'RECOVERY_REQUIRED' and failed.safe_to_continue
adapter.fail_add = False
results = run_management_batch([
replace(request, operation='add', source=source, auto_verify=False),
replace(request, operation='add', name='Independent', source=source, auto_verify=False)],
adapter=adapter, idle_check=lambda *_: None)
assert [result.status for result in results] == ['BLOCKED', 'UPLOADED']
assert all(result.safe_to_continue for result in results)
+3 -41
View File
@@ -80,37 +80,6 @@ def test_restart_shows_unfinished_without_starting_worker(qtbot, tmp_path):
assert 'Block' in window.output.toPlainText()
def test_previous_unsafe_result_allows_retry_and_requires_matching_release_proof(qtbot, tmp_path, monkeypatch):
from test_ui_filters import load_window
from cbb_refresh_verify.management import Capability, ManagementResult
adapter = SimpleNamespace(capabilities=lambda: {op: Capability(True, 'available')
for op in ('add', 'update', 'remove')})
window = load_window(qtbot, tmp_path, monkeypatch, management_adapter=adapter)
library = Path(window.mentor_lmc_path or window.loaded_path)
from cbb_refresh_verify.network_path import LibraryPathLease
current = LibraryPathLease(library, library)
current.retain_for_recovery()
window.library_lease = current
window._management_unsafe = True
window._management_unsafe_library = library
window.select_visible_button.click()
assert window.remove_button.isEnabled(), 'A historical flag must not disable the fresh release check'
window.remove_button.click()
requests = window.management_dialog.requests()
assert requests and all(r.check_previous_release for r in requests)
result = ManagementResult('remove', library, 'Beta', 'Logical-Physical', None,
False, 'complete', 'BLOCKED', True, 'prelaunch failure')
window._management_completed([result])
assert window._management_library_unsafe(library), 'An input failure does not prove the previous session released'
assert current._retained_for_recovery
proof = {'status': 'RELEASE_CONFIRMED', 'library': str(library), 'evidence_path': 'proof.json'}
window._management_completed([replace(result, release_proof=proof)])
qtbot.waitUntil(lambda: window._mapping_busy == 0)
assert not window._management_library_unsafe(library)
assert not current._retained_for_recovery
window.management_dialog.reject()
def test_historical_record_does_not_prevent_catalog_load_and_offers_checked_release(qtbot, tmp_path, monkeypatch):
import pytest
import cbb_refresh_verify.library_lock as locks
@@ -126,16 +95,9 @@ def test_historical_record_does_not_prevent_catalog_load_and_offers_checked_rele
assert window.release_library_button.isEnabled()
assert locks.blocker_path(library).read_text() == '{}'
calls = []
monkeypatch.setattr(locks, 'inspect_residual_sessions', lambda *a:
{'library': str(library), 'sessions': []})
monkeypatch.setattr(locks, 'release_residual_sessions', lambda *a, **kw:
(calls.append(a) or {'status': 'RELEASE_CONFIRMED', 'sessions': [], 'proof':
{'status': 'RELEASE_CONFIRMED', 'library': str(library), 'evidence_path': 'proof.json'}}))
monkeypatch.setattr(QMessageBox, 'question', lambda *a, **k: QMessageBox.Yes)
monkeypatch.setattr(locks, 'release_retained_library', lambda *a:
(calls.append(a) or {'status': 'RELEASE_CONFIRMED', 'evidence_path': 'proof.json'}))
window.release_library_button.click()
qtbot.waitUntil(lambda: not window.release_dialog.busy)
assert not calls
window.release_dialog.confirm_button.click()
qtbot.waitUntil(lambda: not window.release_dialog.busy)
window.release_dialog.close()
qtbot.waitUntil(lambda: not window.busy)
assert len(calls) == 1 and 'proof.json' in window.output.toPlainText()
+1 -2
View File
@@ -46,8 +46,7 @@ def test_add_timeout_publishes_cancellation_without_killing_native_owner(tmp_pat
def poll(self): return None
def close(self): pytest.fail('live worker must not be killed')
adapter=native.NativeManagementAdapter(worker_factory=Running)
result=adapter._launch_worker({'operation':'add','desktop':'CbbManagement_test','timeout_seconds':0,
'library':str(tmp_path/'library.lmc')},tmp_path)
result=adapter._launch_worker({'operation':'add','desktop':'CbbManagement_test','timeout_seconds':0},tmp_path)
assert not result['safe_to_continue'] and (tmp_path/'cancel-native-add.signal').exists()
assert len(native._retained_workers)==1
+1 -2
View File
@@ -163,7 +163,6 @@ def test_closing_app_keeps_manual_native_window_and_mapping(qtbot, tmp_path, mon
window.library_lease = lease
window._native_backup_session = session
window.show(); window.close()
qtbot.waitUntil(lambda: not window.isVisible())
assert retained == [True] and session.process.poll() is None
@@ -215,7 +214,7 @@ def test_confirmed_native_close_transfers_mapping_to_current_library(qtbot, tmp_
assert window._native_backup_session is None
assert backend.cancelled == [] and current.created
window.close()
qtbot.waitUntil(lambda: backend.cancelled == [current.drive])
assert backend.cancelled == [current.drive]
def test_native_mapping_ownership_transfers_to_new_library_on_same_share():
-235
View File
@@ -200,241 +200,6 @@ def test_export_timeout_retains_process_without_kill(project, tmp_path, monkeypa
assert (root/'ascii-process.json').is_file()
def test_export_does_not_adopt_unrelated_existing_native_owner(project, tmp_path, monkeypatch):
import cbb_refresh_verify.native_engineering_identity as identity
source, _ = project
root = tmp_path/'exports'; root.mkdir()
unrelated = {'pid': 888888, 'parent': 0, 'name': 'iCDBNetServer.exe',
'executable': 'native', 'command': 'iCDBNetServer.exe C:\\other\\database'}
monkeypatch.setattr(identity, '_process_snapshot', lambda: [unrelated])
monkeypatch.setattr(identity, '_database_released', lambda _: True)
monkeypatch.setattr(identity, 'validate_export_output', lambda *_: None)
started = []
class Finished:
pid = 987654
returncode = 0
def __init__(self, command, **kwargs): started.append(command)
def poll(self): return 0
monkeypatch.setattr(identity.subprocess, 'Popen', Finished)
result = identity._run_exports(source, root, tmp_path, 1)
assert result['success'] and result['safe_to_continue']
assert len(started) == 3
def test_export_spawn_failure_does_not_manufacture_native_ownership(project, tmp_path, monkeypatch):
import cbb_refresh_verify.native_engineering_identity as identity
source, _ = project
root = tmp_path/'exports'; root.mkdir()
monkeypatch.setattr(identity, '_process_snapshot', lambda: [])
monkeypatch.setattr(identity, '_database_released', lambda _: True)
def fail(*a, **k): raise FileNotFoundError('missing exporter')
monkeypatch.setattr(identity.subprocess, 'Popen', fail)
result = identity._run_exports(source, root, tmp_path, 1)
assert not result['success'] and result['safe_to_continue']
assert 'missing exporter' in result['detail']
def test_unconfirmed_export_constructor_failure_retains_ownership(project, tmp_path, monkeypatch):
import cbb_refresh_verify.native_engineering_identity as identity
source, _ = project
root = tmp_path/'exports'; root.mkdir()
monkeypatch.setattr(identity, '_process_snapshot', lambda: [])
monkeypatch.setattr(identity, '_database_released', lambda _: True)
def fail(*a, **k): raise RuntimeError('uncertain partially-created process')
monkeypatch.setattr(identity.subprocess, 'Popen', fail)
result = identity._run_exports(source, root, tmp_path, 1)
assert not result['success'] and not result['safe_to_continue']
@pytest.mark.parametrize('summary', ['native-outcome.json', 'identity.json'])
def test_export_summary_write_failure_preserves_confirmed_release(project, tmp_path, monkeypatch, summary):
import cbb_refresh_verify.native_engineering_identity as identity
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path
import win32event
from uuid import uuid4
create_mutex = win32event.CreateMutex
monkeypatch.setattr(win32event, 'CreateMutex', lambda security, owned, name:
create_mutex(security, owned, name+'-test-'+uuid4().hex))
source, library = project
monkeypatch.setattr(identity, 'check_exporters', lambda _: None)
monkeypatch.setattr(identity, '_process_snapshot', lambda: [])
def exports(clone, root, *_):
(root/'export-launch.json').write_text('{"started": false}')
return {'success': False, 'safe_to_continue': True, 'detail': 'export rejected before start'}
monkeypatch.setattr(identity, '_run_exports', exports)
original_write = identity._write_json
def write(path, record):
if path.name == summary: raise OSError('summary unavailable')
return original_write(path, record)
monkeypatch.setattr(identity, '_write_json', write)
with LibraryLock(library):
result = identity.capture_identity(source, tmp_path/'analysis', expected_library=library,
owner_library=library, mentor_home=tmp_path)
assert result.identity is None and result.safe_to_continue
assert 'summary unavailable' in result.detail
assert not blocker_path(library).exists()
def test_export_snapshot_uses_bounded_read_only_helper(monkeypatch):
from cbb_refresh_verify import native_engineering_identity as identity, owner_probe
rows = [{'pid': 42, 'parent': 10, 'name': 'unknown-child.exe'}]
calls = []
def query(**kwargs):
calls.append(kwargs)
return rows
monkeypatch.setattr(owner_probe, 'query_process_snapshot', query)
assert identity._process_snapshot() == rows
assert calls == [{'timeout_seconds': 10}]
@pytest.mark.parametrize('after_launch', [False, True])
def test_export_snapshot_timeout_preserves_launch_extent(project, tmp_path, monkeypatch, after_launch):
from cbb_refresh_verify import native_engineering_identity as identity
source, _ = project
root = tmp_path/'exports'; root.mkdir()
calls = []
def snapshot():
calls.append('snapshot')
if after_launch and len(calls) == 1: return []
raise RuntimeError('OWNER_QUERY_TIMEOUT: WMI timed out')
monkeypatch.setattr(identity, '_process_snapshot', snapshot)
monkeypatch.setattr(identity, '_database_released', lambda _: True)
monkeypatch.setattr(identity, '_retained_exports', [])
launched = []
class Running:
pid = 987654
def __init__(self, *a, **k): launched.append(self)
def poll(self): return None
monkeypatch.setattr(identity.subprocess, 'Popen', Running)
result = identity._run_exports(source, root, tmp_path, 1)
assert not result['success']
assert result['safe_to_continue'] is (not after_launch)
assert result['native_started'] is after_launch
assert 'OWNER_QUERY_TIMEOUT' in result['detail']
assert bool(launched) is after_launch
assert bool(identity._retained_exports) is after_launch
def test_prelaunch_snapshot_timeout_releases_only_own_unstarted_guard(project, tmp_path, monkeypatch):
from cbb_refresh_verify import native_engineering_identity as identity
from cbb_refresh_verify.library_lock import LibraryLock, blocker_path
import win32event
from uuid import uuid4
source, library = project
create_mutex = win32event.CreateMutex
monkeypatch.setattr(win32event, 'CreateMutex', lambda security, owned, name:
create_mutex(security, owned, name+'-test-'+uuid4().hex))
monkeypatch.setattr(identity, 'check_exporters', lambda _: None)
calls = []
def snapshot():
calls.append('query')
raise RuntimeError('OWNER_QUERY_TIMEOUT: process tree unavailable')
monkeypatch.setattr(identity, '_process_snapshot', snapshot)
with LibraryLock(library):
result = identity.capture_identity(source, tmp_path/'analysis', expected_library=library,
owner_library=library, mentor_home=tmp_path)
assert result.identity is None and result.safe_to_continue
assert 'OWNER_QUERY_TIMEOUT' in result.detail
assert calls == ['query']
assert not blocker_path(library).exists()
@pytest.mark.parametrize('failure', ['source', 'lease', 'scope', 'exporters', 'directory', 'mutex'])
def test_capture_prevalidation_failure_explicitly_reports_no_native_session(project, tmp_path, monkeypatch, failure):
from cbb_refresh_verify import native_engineering_identity as identity, library_lock
import win32event
source, library = project
root = tmp_path/'analysis'
def reject(*args, **kwargs): raise OSError(f'prevalidation {failure} unavailable')
monkeypatch.setattr(library_lock, 'owned_snapshot', lambda _: b'owned lease')
monkeypatch.setattr(identity, 'check_exporters', lambda _: None)
monkeypatch.setattr(identity, '_run_exports', lambda *a, **k: pytest.fail('native export must not start'))
if failure == 'source': monkeypatch.setattr(identity, 'source_project', reject)
if failure == 'lease': monkeypatch.setattr(library_lock, 'owned_snapshot', lambda _: None)
if failure == 'scope': root = source.parent/'analysis'
if failure == 'exporters': monkeypatch.setattr(identity, 'check_exporters', reject)
if failure == 'directory':
mkdir = Path.mkdir
def create(path, *args, **kwargs):
if path == root: return reject()
return mkdir(path, *args, **kwargs)
monkeypatch.setattr(Path, 'mkdir', create)
if failure == 'mutex': monkeypatch.setattr(win32event, 'CreateMutex', reject)
result = identity.capture_identity(source, root, expected_library=library,
owner_library=library, mentor_home=tmp_path)
assert result.identity is None and result.safe_to_continue
assert result.detail
@pytest.mark.parametrize('failure', ['initial_launch_record', 'final_process_record'])
def test_export_record_io_preserves_known_launch_extent(project, tmp_path, monkeypatch, failure):
from cbb_refresh_verify import native_engineering_identity as identity, library_lock
import win32event
from uuid import uuid4
source, library = project
create_mutex = win32event.CreateMutex
monkeypatch.setattr(win32event, 'CreateMutex', lambda security, owned, name:
create_mutex(security, owned, name+'-test-'+uuid4().hex))
monkeypatch.setattr(identity, 'check_exporters', lambda _: None)
monkeypatch.setattr(identity, '_process_snapshot', lambda: [])
monkeypatch.setattr(identity, '_database_released', lambda _: True)
monkeypatch.setattr(library_lock, '_supervisor_alive', lambda _: False)
launched = []
class Finished:
pid = 987654
returncode = 0
def __init__(self, *args, **kwargs): launched.append(self)
def poll(self): return 0
monkeypatch.setattr(identity.subprocess, 'Popen', Finished)
def content_failure(*args): raise ValueError('native export content rejected')
monkeypatch.setattr(identity, 'validate_export_output', content_failure)
write = identity._write_json
process_writes = []
def fail(path, record):
if path.name == 'export-launch.json' and failure == 'initial_launch_record':
raise OSError('launch metadata unavailable')
if path.name == 'ascii-process.json':
process_writes.append(record.copy())
if failure == 'final_process_record' and len(process_writes) == 2:
raise OSError('final process metadata unavailable')
return write(path, record)
monkeypatch.setattr(identity, '_write_json', fail)
with library_lock.LibraryLock(library):
result = identity.capture_identity(source, tmp_path/'analysis', expected_library=library,
owner_library=library, mentor_home=tmp_path)
assert result.identity is None and result.safe_to_continue
assert 'metadata unavailable' in result.detail
assert bool(launched) is (failure == 'final_process_record')
assert not library_lock.blocker_path(library).exists()
with library_lock.LibraryLock(library): pass
def test_successful_export_keeps_release_when_final_diagnostic_write_fails(project, tmp_path, monkeypatch):
from cbb_refresh_verify import native_engineering_identity as identity
source, _ = project
root = tmp_path/'exports'; root.mkdir()
monkeypatch.setattr(identity, '_process_snapshot', lambda: [])
monkeypatch.setattr(identity, '_database_released', lambda _: True)
monkeypatch.setattr(identity, 'validate_export_output', lambda *_: None)
class Finished:
pid = 987654
returncode = 0
def __init__(self, *args, **kwargs): pass
def poll(self): return 0
monkeypatch.setattr(identity.subprocess, 'Popen', Finished)
write = identity._write_json
counts = {}
def fail(path, record):
if path.name.endswith('-process.json'):
counts[path] = counts.get(path, 0)+1
if counts[path] == 2: raise OSError('final metadata unavailable')
return write(path, record)
monkeypatch.setattr(identity, '_write_json', fail)
result = identity._run_exports(source, root, tmp_path, 1)
assert result['success'] and result['safe_to_continue']
assert 'final metadata unavailable' in result['detail']
def edif_report(timestamp=b'2026 11 3 11 40 56'):
return (b'(edif DxD (edifVersion 2 0 0) (status (written (timestamp '+timestamp+b')'
b' (program "DxDesigner Edif Exporter"))) (library Board1 (cell Top'
-80
View File
@@ -116,83 +116,3 @@ def test_successful_export_clears_only_its_bound_guard_after_fresh_copy_proof(tm
finish_export_analysis(library, token)
assert 'export_analysis' not in json.loads(marker.read_text())
assert not marker.exists()
def test_unrelated_same_name_server_does_not_prevent_copy_release(export_case, monkeypatch):
import cbb_refresh_verify.native_engineering_identity as identity
from cbb_refresh_verify.native_export_guard import prove_export_copies_released
library, root, *_ = export_case
monkeypatch.setattr(identity, '_process_snapshot', lambda: [
{'pid': 777777, 'name': 'iCDBNetServer.exe', 'parent': 0, 'executable': 'native',
'command': 'iCDBNetServer.exe C:\\other\\database'}])
with prove_export_copies_released(library) as copies:
assert copies == [str(root/'project')]
def test_retained_export_registry_is_scoped_to_its_library(tmp_path, monkeypatch):
import cbb_refresh_verify.native_engineering_identity as identity
from cbb_refresh_verify.native_export_guard import assert_retained_exports_idle
from cbb_refresh_verify.library_lock import LibraryBusy
library_a, library_b = tmp_path/'a.lmc', tmp_path/'b.lmc'
monkeypatch.setattr(identity, '_retained_exports', [
(SimpleNamespace(poll=lambda: None), {}, {'library': str(library_a.resolve())})])
assert_retained_exports_idle(library_b)
with pytest.raises(LibraryBusy): assert_retained_exports_idle(library_a)
@pytest.mark.parametrize('created,blocked', [('new-process', False), ('original-process', True)])
def test_recorded_export_pid_reuse_requires_matching_creation_identity(export_case, monkeypatch, created, blocked):
import cbb_refresh_verify.native_engineering_identity as identity
import cbb_refresh_verify.library_lock as locks
from cbb_refresh_verify.native_export_guard import prove_export_copies_released
library, root, *_ = export_case
path = root/'ascii-process.json'
record = json.loads(path.read_text('utf-8'))
record['process_identities'] = [{'pid': 123456, 'created': 'original-process', 'executable': 'native'}]
path.write_text(json.dumps(record), encoding='utf-8')
monkeypatch.setattr(locks, '_supervisor_alive', lambda _: True)
monkeypatch.setattr(identity, '_process_snapshot', lambda: [
{'pid': 123456, 'name': 'unrelated.exe', 'parent': 0,
'executable': 'native', 'created': created, 'command': ''}])
if blocked:
with pytest.raises(locks.LibraryBusy):
with prove_export_copies_released(library): pass
else:
with prove_export_copies_released(library): pass
@pytest.mark.parametrize('active', [False, True])
def test_unknown_checkpoint_requires_explicit_full_proof_and_no_native_export_owner(tmp_path, monkeypatch, active):
import cbb_refresh_verify.native_engineering_identity as identity
import cbb_refresh_verify.library_lock as locks
from cbb_refresh_verify.native_export_guard import prove_export_copies_released
library = tmp_path/'lib.lmc'; library.touch()
locks.blocker_path(library).write_text('{torn metadata')
monkeypatch.setattr(identity, '_retained_exports', [])
monkeypatch.setattr(identity, '_process_snapshot', lambda: [
{'pid': 12345, 'name': 'iCDBNetServer.exe', 'parent': 0}] if active else [])
with pytest.raises(locks.LibraryBusy):
with prove_export_copies_released(library): pass
if active:
with pytest.raises(locks.LibraryBusy):
with prove_export_copies_released(library, allow_unknown_checkpoint=True): pass
else:
with prove_export_copies_released(library, allow_unknown_checkpoint=True) as copies:
assert copies == []
assert locks.blocker_path(library).read_text() == '{torn metadata'
@pytest.mark.parametrize('no_start_proven', [False, True])
def test_missing_pid_requires_bound_no_start_evidence(export_case, no_start_proven):
from cbb_refresh_verify.native_export_guard import prove_export_copies_released
from cbb_refresh_verify.library_lock import LibraryBusy
library, root, *_ = export_case
record = {'success': False, 'safe_to_continue': True}
if no_start_proven: record['native_started'] = False
(root/'ascii-process.json').write_text(json.dumps(record), encoding='utf-8')
(root/'export-launch.json').write_text(json.dumps({'started': not no_start_proven}), encoding='utf-8')
if no_start_proven:
with prove_export_copies_released(library): pass
else:
with pytest.raises(LibraryBusy):
with prove_export_copies_released(library): pass
+191 -191
View File
@@ -1,191 +1,191 @@
import json
from pathlib import Path
import pytest
def output(project, database, *, fault=False, busy=False):
text = f'Loading project file [{project}].\nChecking if project is in use.\n'
if fault:
text += (f'Project database [{database}] is inconsistent. It has been manually copied while the iCDB Server was running. '
"Please use iCDB Project Backup 'Repair project' functionality to fix this issue.\n")
return text + ('Project is in use.\n' if busy else
"Project is not in use. Full iCDB Project Backup's functionality is available.\nBackup information loaded correctly.\n")
@pytest.mark.parametrize('fault,busy,status,repair', [
(False, False, 'NOT_IN_USE', False), (True, False, 'NOT_IN_USE', True),
(True, True, 'IN_USE', False), (False, True, 'IN_USE', False)])
def test_native_ownership_and_repair_need_are_separate(tmp_path, fault, busy, status, repair):
from cbb_refresh_verify.native_occupancy import classify_inspection
project, database = tmp_path/'A.prj', tmp_path/'database'
result = classify_inspection(project, database, output(project, database, fault=fault, busy=busy))
assert result['status'] == status
assert result['repair_required'] is repair
@pytest.mark.parametrize('case', ['progress', 'wrong_project', 'wrong_database', 'stale_verdict', 'generic_repair'])
def test_incomplete_or_foreign_output_cannot_authorize_repair(tmp_path, case):
from cbb_refresh_verify.native_occupancy import classify_inspection
project, database = tmp_path/'A.prj', tmp_path/'database'
text = output(project, database, fault=True)
if case == 'progress': text = f'Loading project file [{project}].\nChecking if project is in use.'
if case == 'wrong_project': text = output(tmp_path/'Other.prj', database, fault=True)
if case == 'wrong_database': text = output(project, tmp_path/'other', fault=True)
if case == 'stale_verdict': text += 'Checking if project is in use.\n'
if case == 'generic_repair': text = output(project, database) + 'Please try to repair the project!'
assert classify_inspection(project, database, text)['repair_required'] is False
@pytest.mark.parametrize('fault,busy', [(False, False), (True, False), (False, True)])
def test_inspection_mode_only_observes_and_closes_its_tool(tmp_path, monkeypatch, fault, busy):
import win32con
from test_native_repair import repair_worker_fixture
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr(ui, '_repair_command', lambda *a: pytest.fail('inspection resolved Repair command'))
monkeypatch.setattr(ui, '_native_output', lambda *_: output(data['project'], data['database'], fault=fault, busy=busy))
assert ui.repair_worker_main(job) == 0
result = json.loads((root/'repair-result.json').read_text('utf-8'))
assert result['status'] == ('IN_USE' if busy else 'NOT_IN_USE')
assert result['release']['native_exited'] is True
assert result['repair_required'] is (fault and not busy)
assert actions == [(100, win32con.WM_CLOSE)]
def test_generic_project_backup_shell_is_accepted_as_the_single_target_window(tmp_path, monkeypatch):
import json
from test_native_repair import repair_worker_fixture
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr(ui, '_native_output', lambda windows: (
f'Loading project file [{data["project"]}].\nChecking if project is in use.\n'
"Project is not in use. Full iCDB Project Backup's functionality is available.\n"
'Backup information loaded correctly.'))
assert ui.repair_worker_main(job) == 0
def test_only_check_never_counts_as_repair_success():
from cbb_refresh_verify.icdb_maintenance import maintenance_counts
from cbb_refresh_verify.verify_runner import VerifyResult
counts = maintenance_counts([VerifyResult('CHECKED', safe_to_continue=True)])
assert counts['passed'] == counts['repaired'] == 0
assert counts['checked_without_repair'] == 1
def test_cancelled_probe_returns_within_grace_without_killing_native(tmp_path, monkeypatch):
from threading import Event
from types import SimpleNamespace
from cbb_refresh_verify import native_repair as native
from cbb_refresh_verify.native_repair import RepairTarget
stop = Event(); ticks = [0.0]; actions = []
def sleep(seconds):
ticks[0] += seconds
stop.set()
monkeypatch.setattr(native, 'time', SimpleNamespace(monotonic=lambda: ticks[0], sleep=sleep))
class Worker:
pid = 123
def __init__(self, *a): pass
def bind_cancellation(self, p): pass
def poll(self): return None
def request_stop(self): actions.append('cancel')
def close(self): actions.append('close_handles')
def kill(self): pytest.fail('native owner must not be killed')
monkeypatch.setattr('cbb_refresh_verify.desktop_worker.DesktopWorker', Worker)
result = native.run_native_repair(RepairTarget(tmp_path/'A.prj', tmp_path/'database'),
tmp_path/'evidence', timeout_seconds=600, inspection_only=True, stop=stop)
assert ticks[0] < 6
assert result['status'] == 'CANCELLED_UNRELEASED'
assert result['release']['safe_to_continue'] is False
assert actions[-1] == 'close_handles'
def test_ui_keeps_processing_events_and_passes_cancel_to_native_task(qtbot, tmp_path, monkeypatch):
from threading import Event
from PySide6.QtCore import QTimer
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
entered = Event(); cancelled = Event(); ticks = []
def verify(req, *, stop, **kw):
entered.set()
if stop.wait(3): cancelled.set()
return VerifyResult('CANCELLED')
monkeypatch.setattr('cbb_refresh_verify.verify_runner.run_verify', verify)
window = load_window(qtbot, tmp_path, monkeypatch,
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
window.search_edit.setText('Beta')
timer = QTimer(window); timer.setInterval(10); timer.timeout.connect(lambda: ticks.append(True)); timer.start()
window.repair_icdb_all()
qtbot.waitUntil(entered.is_set)
qtbot.waitUntil(lambda: len(ticks) >= 3)
assert not window.busy and window._icdb_active() and window.stop_button.isEnabled()
window.stop_button.click()
qtbot.waitUntil(lambda: not window._icdb_active())
assert cancelled.is_set()
@pytest.mark.parametrize('extra', ['foreign_session', 'extra_error'])
def test_foreign_or_additional_fault_is_never_a_clean_inspection(tmp_path, extra):
from cbb_refresh_verify.native_occupancy import classify_inspection
project, database = tmp_path/'A.prj', tmp_path/'database'
text = output(project, database, fault=extra == 'extra_error')
if extra == 'foreign_session':
text += ('The last server session on different server machine lost the connection to the database. '
'Machine:[SERVER] Path:[C:/Other/Work/database] session:[old]')
else:
text += 'ERROR: shared symbol database unavailable'
assert classify_inspection(project, database, text)['status'] == 'UNCONFIRMED'
def test_unconfirmed_inspection_closes_known_main_at_timeout(tmp_path, monkeypatch):
import win32con
from test_native_repair import repair_worker_fixture
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr(ui, '_native_output', lambda *_: 'Unrecognized response')
assert ui.repair_worker_main(job) == 1
result = json.loads((root/'repair-result.json').read_text('utf-8'))
assert result['status'] == 'UNCONFIRMED'
assert result['release']['native_exited'] is True
assert actions == [(100, win32con.WM_CLOSE)]
def test_directory_scan_honors_cancel_between_entries(tmp_path):
from cbb_refresh_verify.scoped_manifest import scan_tree
for i in range(10): (tmp_path/f'{i}.dat').touch()
calls = []
def cancel():
calls.append(True)
if len(calls) == 3: raise RuntimeError('CANCELLED')
with pytest.raises(RuntimeError, match='CANCELLED'):
scan_tree(tmp_path, check=cancel)
assert len(calls) == 3
def test_cancel_during_final_guard_cannot_launch_native_tool(tmp_path, monkeypatch):
from contextlib import contextmanager
from test_native_repair import repair_worker_fixture
from cbb_refresh_verify.native_repair import RepairTarget
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8'))
data['maintenance_context'] = {'library': str(tmp_path/'lib.lmc'), 'block': 'CBB1'}
job.write_text(json.dumps(data), encoding='utf-8')
calls = []
@contextmanager
def guard(*a, **kw):
calls.append(True)
yield {'target': RepairTarget(Path(data['project']), Path(data['database']))}
Path(data['cancel_signal']).touch()
monkeypatch.setattr('cbb_refresh_verify.maintenance_entry.maintenance_target_guard', guard)
monkeypatch.setattr(ui.subprocess, 'Popen', lambda *a, **kw: pytest.fail('late native launch'))
assert ui.repair_worker_main(job) == 1
assert len(calls) == 1 and not actions
def test_verified_cbb_refusal_is_not_hidden_by_secondary_release_failure():
from cbb_refresh_verify.verify_runner import classify_failure_category
detail = ('BackAnnotate: Back Annotation is not allowed on verified (or once verified) Reusable Blocks.'
'\nPCB_RELEASE_UNCONFIRMED: not released')
assert classify_failure_category(detail) == 'CBB_REIMPORT_REQUIRED'
import json
from pathlib import Path
import pytest
def output(project, database, *, fault=False, busy=False):
text = f'Loading project file [{project}].\nChecking if project is in use.\n'
if fault:
text += (f'Project database [{database}] is inconsistent. It has been manually copied while the iCDB Server was running. '
"Please use iCDB Project Backup 'Repair project' functionality to fix this issue.\n")
return text + ('Project is in use.\n' if busy else
"Project is not in use. Full iCDB Project Backup's functionality is available.\nBackup information loaded correctly.\n")
@pytest.mark.parametrize('fault,busy,status,repair', [
(False, False, 'NOT_IN_USE', False), (True, False, 'NOT_IN_USE', True),
(True, True, 'IN_USE', False), (False, True, 'IN_USE', False)])
def test_native_ownership_and_repair_need_are_separate(tmp_path, fault, busy, status, repair):
from cbb_refresh_verify.native_occupancy import classify_inspection
project, database = tmp_path/'A.prj', tmp_path/'database'
result = classify_inspection(project, database, output(project, database, fault=fault, busy=busy))
assert result['status'] == status
assert result['repair_required'] is repair
@pytest.mark.parametrize('case', ['progress', 'wrong_project', 'wrong_database', 'stale_verdict', 'generic_repair'])
def test_incomplete_or_foreign_output_cannot_authorize_repair(tmp_path, case):
from cbb_refresh_verify.native_occupancy import classify_inspection
project, database = tmp_path/'A.prj', tmp_path/'database'
text = output(project, database, fault=True)
if case == 'progress': text = f'Loading project file [{project}].\nChecking if project is in use.'
if case == 'wrong_project': text = output(tmp_path/'Other.prj', database, fault=True)
if case == 'wrong_database': text = output(project, tmp_path/'other', fault=True)
if case == 'stale_verdict': text += 'Checking if project is in use.\n'
if case == 'generic_repair': text = output(project, database) + 'Please try to repair the project!'
assert classify_inspection(project, database, text)['repair_required'] is False
@pytest.mark.parametrize('fault,busy', [(False, False), (True, False), (False, True)])
def test_inspection_mode_only_observes_and_closes_its_tool(tmp_path, monkeypatch, fault, busy):
import win32con
from test_native_repair import repair_worker_fixture
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr(ui, '_repair_command', lambda *a: pytest.fail('inspection resolved Repair command'))
monkeypatch.setattr(ui, '_native_output', lambda *_: output(data['project'], data['database'], fault=fault, busy=busy))
assert ui.repair_worker_main(job) == 0
result = json.loads((root/'repair-result.json').read_text('utf-8'))
assert result['status'] == ('IN_USE' if busy else 'NOT_IN_USE')
assert result['release']['native_exited'] is True
assert result['repair_required'] is (fault and not busy)
assert actions == [(100, win32con.WM_CLOSE)]
def test_generic_project_backup_shell_is_accepted_as_the_single_target_window(tmp_path, monkeypatch):
import json
from test_native_repair import repair_worker_fixture
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr(ui, '_native_output', lambda windows: (
f'Loading project file [{data["project"]}].\nChecking if project is in use.\n'
"Project is not in use. Full iCDB Project Backup's functionality is available.\n"
'Backup information loaded correctly.'))
assert ui.repair_worker_main(job) == 0
def test_only_check_never_counts_as_repair_success():
from cbb_refresh_verify.icdb_maintenance import maintenance_counts
from cbb_refresh_verify.verify_runner import VerifyResult
counts = maintenance_counts([VerifyResult('CHECKED', safe_to_continue=True)])
assert counts['passed'] == counts['repaired'] == 0
assert counts['checked_without_repair'] == 1
def test_cancelled_probe_returns_within_grace_without_killing_native(tmp_path, monkeypatch):
from threading import Event
from types import SimpleNamespace
from cbb_refresh_verify import native_repair as native
from cbb_refresh_verify.native_repair import RepairTarget
stop = Event(); ticks = [0.0]; actions = []
def sleep(seconds):
ticks[0] += seconds
stop.set()
monkeypatch.setattr(native, 'time', SimpleNamespace(monotonic=lambda: ticks[0], sleep=sleep))
class Worker:
pid = 123
def __init__(self, *a): pass
def bind_cancellation(self, p): pass
def poll(self): return None
def request_stop(self): actions.append('cancel')
def close(self): actions.append('close_handles')
def kill(self): pytest.fail('native owner must not be killed')
monkeypatch.setattr('cbb_refresh_verify.desktop_worker.DesktopWorker', Worker)
result = native.run_native_repair(RepairTarget(tmp_path/'A.prj', tmp_path/'database'),
tmp_path/'evidence', timeout_seconds=600, inspection_only=True, stop=stop)
assert ticks[0] < 6
assert result['status'] == 'CANCELLED_UNRELEASED'
assert result['release']['safe_to_continue'] is False
assert actions[-1] == 'close_handles'
def test_ui_keeps_processing_events_and_passes_cancel_to_native_task(qtbot, tmp_path, monkeypatch):
from threading import Event
from PySide6.QtCore import QTimer
from test_ui_filters import load_window
from cbb_refresh_verify.verify_runner import VerifyResult
entered = Event(); cancelled = Event(); ticks = []
def verify(req, *, stop, **kw):
entered.set()
if stop.wait(3): cancelled.set()
return VerifyResult('CANCELLED')
monkeypatch.setattr('cbb_refresh_verify.verify_runner.run_verify', verify)
window = load_window(qtbot, tmp_path, monkeypatch,
status_refresher=lambda names, _: {name: 'PENDING' for name in names})
window.search_edit.setText('Beta')
timer = QTimer(window); timer.setInterval(10); timer.timeout.connect(lambda: ticks.append(True)); timer.start()
window.repair_icdb_all()
qtbot.waitUntil(entered.is_set)
qtbot.waitUntil(lambda: len(ticks) >= 3)
assert window.busy and window.stop_button.isEnabled()
window.stop_button.click()
qtbot.waitUntil(lambda: not window.busy)
assert cancelled.is_set()
@pytest.mark.parametrize('extra', ['foreign_session', 'extra_error'])
def test_foreign_or_additional_fault_is_never_a_clean_inspection(tmp_path, extra):
from cbb_refresh_verify.native_occupancy import classify_inspection
project, database = tmp_path/'A.prj', tmp_path/'database'
text = output(project, database, fault=extra == 'extra_error')
if extra == 'foreign_session':
text += ('The last server session on different server machine lost the connection to the database. '
'Machine:[SERVER] Path:[C:/Other/Work/database] session:[old]')
else:
text += 'ERROR: shared symbol database unavailable'
assert classify_inspection(project, database, text)['status'] == 'UNCONFIRMED'
def test_unconfirmed_inspection_closes_known_main_at_timeout(tmp_path, monkeypatch):
import win32con
from test_native_repair import repair_worker_fixture
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8')); data['inspection_only'] = True
job.write_text(json.dumps(data), encoding='utf-8')
monkeypatch.setattr(ui, '_native_output', lambda *_: 'Unrecognized response')
assert ui.repair_worker_main(job) == 1
result = json.loads((root/'repair-result.json').read_text('utf-8'))
assert result['status'] == 'UNCONFIRMED'
assert result['release']['native_exited'] is True
assert actions == [(100, win32con.WM_CLOSE)]
def test_directory_scan_honors_cancel_between_entries(tmp_path):
from cbb_refresh_verify.scoped_manifest import scan_tree
for i in range(10): (tmp_path/f'{i}.dat').touch()
calls = []
def cancel():
calls.append(True)
if len(calls) == 3: raise RuntimeError('CANCELLED')
with pytest.raises(RuntimeError, match='CANCELLED'):
scan_tree(tmp_path, check=cancel)
assert len(calls) == 3
def test_cancel_during_final_guard_cannot_launch_native_tool(tmp_path, monkeypatch):
from contextlib import contextmanager
from test_native_repair import repair_worker_fixture
from cbb_refresh_verify.native_repair import RepairTarget
ui, root, job, actions = repair_worker_fixture(tmp_path, monkeypatch, 'active')
data = json.loads(job.read_text('utf-8'))
data['maintenance_context'] = {'library': str(tmp_path/'lib.lmc'), 'block': 'CBB1'}
job.write_text(json.dumps(data), encoding='utf-8')
calls = []
@contextmanager
def guard(*a, **kw):
calls.append(True)
yield {'target': RepairTarget(Path(data['project']), Path(data['database']))}
Path(data['cancel_signal']).touch()
monkeypatch.setattr('cbb_refresh_verify.maintenance_entry.maintenance_target_guard', guard)
monkeypatch.setattr(ui.subprocess, 'Popen', lambda *a, **kw: pytest.fail('late native launch'))
assert ui.repair_worker_main(job) == 1
assert len(calls) == 1 and not actions
def test_verified_cbb_refusal_is_not_hidden_by_secondary_release_failure():
from cbb_refresh_verify.verify_runner import classify_failure_category
detail = ('BackAnnotate: Back Annotation is not allowed on verified (or once verified) Reusable Blocks.'
'\nPCB_RELEASE_UNCONFIRMED: not released')
assert classify_failure_category(detail) == 'CBB_REIMPORT_REQUIRED'
+1 -1
View File
@@ -446,7 +446,7 @@ def test_repair_without_application_backup_still_rejects_busy_database(tmp_path,
try:
monkeypatch.setattr(ui.subprocess, 'Popen', lambda *a, **kw: pytest.fail('busy database launched'))
assert ui.repair_worker_main(job) == 1
assert 'REPAIR_DATABASE_IN_USE' in json.loads((root/'repair-result.json').read_text(encoding='utf-8'))['detail']
assert 'REPAIR_DATABASE_IN_USE' in json.loads((root/'repair-result.json').read_text())['detail']
finally:
handle.Close()
-65
View File
@@ -1,65 +0,0 @@
from cbb_refresh_verify import network_path as network
from test_network_path import FakeWNet
def test_releasing_a_keeps_shared_mapping_until_retained_b_releases(monkeypatch):
monkeypatch.setattr(network, '_retained_path_leases', {})
backend = FakeWNet()
original_a = network.LibraryPathLease.acquire(r'\\server\share\A\lib.lmc', backend=backend)
b = network.LibraryPathLease.acquire(r'\\server\share\B\lib.lmc', backend=backend)
original_a.retain_for_recovery(); b.retain_for_recovery()
current_a = network.LibraryPathLease.acquire(r'\\server\share\A\lib.lmc', backend=backend)
network.release_retained_path_leases(
{'status': 'RELEASE_CONFIRMED', 'library': str(original_a.mentor_path)}, current_lease=current_a)
current_a.close()
assert backend.cancelled == [] and b._retained_for_recovery and b.created
network.release_retained_path_leases({'status': 'RELEASE_CONFIRMED', 'library': str(b.mentor_path)})
assert backend.cancelled == [original_a.drive]
def test_unbound_directory_cannot_accept_an_arbitrary_sibling_library_proof(monkeypatch):
monkeypatch.setattr(network, '_retained_path_leases', {})
lease = network.LibraryPathLease.acquire(r'\\server\share\Folder', backend=FakeWNet())
lease.retain_for_recovery()
proof = {'status': 'RELEASE_CONFIRMED', 'library': r'\\server\share\Folder\other.lmc'}
assert not lease.release_after_recovery(proof)
# The library reader binds the selected LMC before retaining a loaded lease.
lease.mentor_path = lease.mentor_path/'chosen.lmc'
assert not lease.release_after_recovery(proof)
proof['library'] = r'\\server\share\Folder\chosen.lmc'
assert lease.release_after_recovery(proof)
def test_closing_scanner_lease_preserves_an_unpublished_live_reader_lease():
backend = FakeWNet()
scanner = network.LibraryPathLease.acquire(r'\\server\share\A\lib.lmc', backend=backend)
reader = network.LibraryPathLease.acquire(r'\\server\share\B\lib.lmc', backend=backend)
scanner.close()
assert not backend.cancelled and reader.created
reader.close()
assert backend.cancelled == [scanner.drive]
def test_acquire_and_close_do_not_race_before_new_reader_is_registered():
from threading import Event, Thread
entered, release = Event(), Event()
class Backend(FakeWNet):
block = False
def mappings(self):
snapshot = super().mappings()
if self.block:
entered.set(); assert release.wait(3)
return snapshot
backend = Backend()
scanner = network.LibraryPathLease.acquire(r'\\server\share\A\lib.lmc', backend=backend)
backend.block = True
leases = []
reader = Thread(target=lambda: leases.append(network.LibraryPathLease.acquire(
r'\\server\share\B\lib.lmc', backend=backend)))
closer = Thread(target=scanner.close)
reader.start(); assert entered.wait(1)
closer.start(); release.set()
reader.join(2); closer.join(2)
assert leases and not backend.cancelled and leases[0].created
leases[0].close()
assert backend.cancelled == [scanner.drive]
Loaded 100 of 121 files, more files were not shown because too many files have changed in this diff. Show more