From 1572e2d8cab905c28f96f562851db00ef7ea8ad6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=98=BF=E7=99=BD=E5=8F=94?= <11794527+absfan@user.noreply.gitee.com> Date: Fri, 13 Nov 2026 15:29:00 +0800 Subject: [PATCH] fix: decouple CBB imports from optional export diagnostics --- README.md | 6 +- SOP.md | 4 +- ...26-11-13-import-decoupling-validation.json | 319 ++++++++++++++++++ docs/releases/2026-11-13-import-decoupling.md | 57 ++++ src/cbb_refresh_verify/management.py | 16 +- .../native_engineering_identity.py | 25 +- src/cbb_refresh_verify/native_management.py | 63 ++-- .../ui/management_dialog.py | 9 +- tests/test_import_without_export_gate.py | 124 +++++++ tests/test_management_native_transaction.py | 29 +- tests/test_management_ui.py | 2 +- tests/test_native_management.py | 12 +- 12 files changed, 601 insertions(+), 65 deletions(-) create mode 100644 docs/releases/2026-11-13-import-decoupling-validation.json create mode 100644 docs/releases/2026-11-13-import-decoupling.md create mode 100644 tests/test_import_without_export_gate.py diff --git a/README.md b/README.md index 63b210a..8f11527 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,9 @@ 自动流程不强杀原生会话;释放入口默认正常关闭。另有单独确认的“强制结束客户端”操作,仅限属于当前 Windows 用户和会话、归属及进程身份已确认的 PCB、Library Manager、DxDesigner/viewdraw、iCDB Project Backup 客户端。**ICDB 数据库服务器、后台导入器和归属未知的进程不允许强制结束**,即使命令指向当前库也不例外。客户端中其他已打开工程可能一并退出、未保存更改可能丢失;必须先记录确认名单,结束后重新证明库已释放,不能宣称数据库已修复。详见 [操作规程](SOP.md) 与 [版本说明](docs/releases/v0.2.4-beta.1.md)。下方日期记录为历史行为,以本说明为准。 -本目录是独立的 CBB 中心库上传后校验工具,不属于 Part Replacement,也不负责 CBB 工程复制或中心库上传。 +本目录是独立的 CBB 检验、ICDB 维护和中心库管理工具,不属于 Part Replacement;管理入口接收已整理好的完整 PRJ/PCB 工程。 + +导入不运行 ASCII、CSV 或 EDIF 导出。新增/替换确认原生注册、目录复读、工程关联、顶层块及 Layout;顶层块允许保持来源名,或由原生导入改为本次 CBB 注册名,映射会单独记录。其余工程文件差异保留清单供核对,不以原生改写 PRJ 或运行历史判定导入失败。原生重写 ICDB 后不比较其原始字节,也不宣称已证明原理图语义等价。上传后自动校验可独立勾选,只有完整原生 Verify 和权威 READY 才显示校验通过。无效来源或已释放的单项失败逐项报告,不影响后续独立条目。 针对 `The last server session ... lost the connection to the database`,修复分支增加 `ICDB_REPAIR_REQUIRED` 专项识别、共享符号库路径诊断及停止批次处理。现场原生修复步骤及实现边界见 @@ -21,7 +23,7 @@ Windows 11 / Mentor EE7.9.5 隔离库已完成原生更新、备份恢复、校验到 READY 和释放验证,记录见 [2026-11-12 验证](docs/releases/2026-11-12-scoped-release-validation.md)。历史候选包仅证明对应提交,后续代码合并不等同于现场验收或正式发布。 -- A/B 输入的原生 EDIF 导出曾返回 `0xC0000005`,根因尚未定位,相关输入继续按失败处理。 +- A/B 输入的独立 EDIF 导出曾返回 `0xC0000005`,根因尚未定位;该导出已从普通导入流程移出,不能据此判定导入失败或 ICDB 损坏。 - Windows 10、跨机器共享库和现场服务器会话失联的一致故障副本尚未验收。跨机器释放依赖 SMB 共享模式语义,目前没有跨机器实测证明。 - 自动 ICDB Repair 保持关闭。共享库原生服务器若无法删除自身地址文件,或早停后仍有原生弹窗,需要继续核对;不以进程列表为空或端口不可达代替释放证明。 - 验收文档中的本机路径、原始日志、截图、测试 XML 和冻结包不随 Git 分发;仓库保留说明及摘要,原始材料须在验收机器查看或另行归档。 diff --git a/SOP.md b/SOP.md index f897fdc..39a2092 100644 --- a/SOP.md +++ b/SOP.md @@ -16,6 +16,8 @@ 新增拒绝同名冲突;更新先原生移除再导入,失败可能需要人工备份恢复;移除后重新读取目录确认。版本回退由操作员在原生界面选择,核对工程内容后单独校验。 +新增和替换不调用 ASCII/CSV/EDIF 导出器;原生成功回执、重新读库、目标工程关联、顶层块及 Layout 确认后记录上传完成,不等同于 READY 或原理图语义等价。顶层块允许来源名或本次 CBB 注册名,保留原生命名变换记录;其他名称仍拒绝。其余文件差异单独保留清单并提示核对,不因 PRJ 规范化或历史记录差异阻止后续条目。可在批次开始前取消“上传后自动校验”。来源旧库路径可在暂存副本中改为所选目标库,来源原件不改;无效来源按行报告,已释放的失败不阻止后续条目。 + ## 历史记录、操作结果与报告 校验和管理遇到历史释放记录时,先复核实际进程、地址、独占文件及导出副本。确认释放后归档记录再继续,不以历史 JSON 本身判定真实占用;同目标未完成写入仍需核对,不自动重放。释放证明在管理首次原生调用前写入检查点,并在结果中保留。 @@ -40,7 +42,7 @@ ## 已知限制与证据位置 -A/B 输入的原生 EDIF 导出曾返回 `0xC0000005`,尚未定位,不能将该输入记成导入通过。Windows 10、跨机器共享库和现场失联故障副本仍待验收;跨机释放依赖 SMB 共享模式语义,目前没有跨机实测。自动 ICDB Repair 保持关闭,共享数据库地址残留或晚到弹窗按现场状态继续核对。 +A/B 输入的独立 EDIF 导出曾返回 `0xC0000005`,尚未定位;普通导入已不依赖该导出,导入是否完成以本次原生操作与复读证据判定。Windows 10、跨机器共享库和现场失联故障副本仍待验收;跨机释放依赖 SMB 共享模式语义,目前没有跨机实测。自动 ICDB Repair 保持关闭,共享数据库地址残留或晚到弹窗按现场状态继续核对。 代码合并不表示现场验收完成。文档中的本机路径、日志、截图、测试 XML 和候选包未入库;仓库仅保留验证摘要,原始材料需在验收机器查看或另行归档。 diff --git a/docs/releases/2026-11-13-import-decoupling-validation.json b/docs/releases/2026-11-13-import-decoupling-validation.json new file mode 100644 index 0000000..2a53def --- /dev/null +++ b/docs/releases/2026-11-13-import-decoupling-validation.json @@ -0,0 +1,319 @@ +{ + "created": "2026-11-13T15:28:15.015734+08:00", + "base_main": "cbc57238496bc84f4228aa44929208a9516dff1b", + "branch": "codex/import-without-export-gate", + "full_suite": { + "tests": 1895, + "failures": 0, + "errors": 0, + "skipped": 0 + }, + "first_wrong_source_suite": { + "tests": 1893, + "failures": 15, + "errors": 0, + "skipped": 0 + }, + "first_wrong_source_reason": "Subprocesses used the editable original checkout; corrected by explicit PYTHONPATH to this worktree.", + "frozen": { + "module_count": 64, + "source_and_frozen_code_equal": true, + "source_sha256_checked": true, + "packaged_assets_equal": true, + "exe_icon_images_equal": true, + "executable_sha256": "98a642d8e81f42b708934bb4dc2d023c49c2acdae5851151a430f101c74c9615" + }, + "native": [ + { + "name": "1GPHY_RTL8211F_A", + "status": "UPLOADED_VERIFY_FAILED", + "safe_to_continue": true, + "detail": "原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。其他工程文件有差异,已记录供核对。\nProject Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase", + "checkpoint": "F:\\CbbI1113\\d3\\management\\management-9a5e12feb292441e8c5709270ffef18b\\checkpoint.json", + "native_add_success": true, + "registration_matches": true, + "top_level_block_mapping": { + "source": "1GPHY_RTL8211F", + "registered": "1GPHY_RTL8211F_A", + "allowed": [ + "1GPHY_RTL8211F", + "1GPHY_RTL8211F_A" + ] + }, + "assets_match": false, + "asset_differences": { + "added": [ + "PCB/1GPHY_RTL8211F_A.pcb", + "database/cdbback/2026-11-13 15.12.50-49956.zip" + ], + "deleted": [ + "PCB/1GPHY_RTL8211F.pcb" + ], + "modified": [ + "1GPHY_RTL8211F_A.prj" + ] + }, + "verification": [ + { + "stage": "verified", + "time": "2026-11-13T07:18:34.641758+00:00", + "verification": { + "status": "FAIL", + "stderr": "Project Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase", + "stdout": "", + "evidence_path": "F:\\CbbI1113\\d3\\management\\management-9a5e12feb292441e8c5709270ffef18b\\verify\\verify-43d609b6535d\\result.json", + "safe_to_continue": true, + "library_flag": "UNKNOWN", + "library_flag_detail": "", + "report_path": null, + "content_check_exit_code": null, + "error_category": "MENTOR_PROJECT_INTEGRATION", + "error_stage": "forward_annotation", + "bridge_attempts": [], + "timings_seconds": { + "preflight": 0.031, + "worker_setup": 6.328, + "pcb_startup": 100.469, + "failure_diagnostics": 1.25, + "integration": 24.953, + "forward_annotation": 24.812, + "total": 133.406 + }, + "incomplete_timing_phases": [ + "integration", + "forward_annotation" + ], + "recovery_attempts": [], + "release_proof": null, + "write_outcome": { + "save_state": "UNKNOWN", + "close_state": "UNKNOWN", + "helper_state": "EXITED", + "resource_state": "RELEASED", + "interrupted": false, + "detail": "保存返回结果无法确认" + }, + "session_record_path": "F:\\CbbI1113\\d3\\management\\management-9a5e12feb292441e8c5709270ffef18b\\verify\\verify-43d609b6535d\\session.json" + } + } + ] + }, + { + "name": "1GPHY_RTL8211F", + "status": "UPLOADED_VERIFY_FAILED", + "safe_to_continue": true, + "detail": "原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。其他工程文件有差异,已记录供核对。\nProject Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase", + "checkpoint": "F:\\CbbI1113\\d3\\management\\management-6be18dcb186846e78b3220b59631249e\\checkpoint.json", + "native_add_success": true, + "registration_matches": true, + "top_level_block_mapping": { + "source": "1GPHY_RTL8211F", + "registered": "1GPHY_RTL8211F", + "allowed": [ + "1GPHY_RTL8211F", + "1GPHY_RTL8211F" + ] + }, + "assets_match": false, + "asset_differences": { + "added": [], + "deleted": [ + "database/cdbsvr/events/events - Abs 的冲突副本 1 - 2026-09-16 07-16-58.dat", + "database/cdbsvr/events/events - Abs 的冲突副本 1 - 2026-09-16 07-16-58.idx" + ], + "modified": [ + "1GPHY_RTL8211F.prj" + ] + }, + "verification": [ + { + "stage": "verified", + "time": "2026-11-13T07:23:45.773452+00:00", + "verification": { + "status": "FAIL", + "stderr": "Project Integration error: ERROR: There are no PartsDB partitions from which to extract parts | ERROR: Unable to create local PDB | ERROR: Problem Making Local Parts DataBase", + "stdout": "", + "evidence_path": "F:\\CbbI1113\\d3\\management\\management-6be18dcb186846e78b3220b59631249e\\verify\\verify-53e1561b73fa\\result.json", + "safe_to_continue": true, + "library_flag": "UNKNOWN", + "library_flag_detail": "", + "report_path": null, + "content_check_exit_code": null, + "error_category": "MENTOR_PROJECT_INTEGRATION", + "error_stage": "forward_annotation", + "bridge_attempts": [], + "timings_seconds": { + "preflight": 0.047, + "worker_setup": 3.766, + "pcb_startup": 80.469, + "failure_diagnostics": 1.39, + "integration": 22.359, + "forward_annotation": 22.297, + "total": 106.844 + }, + "incomplete_timing_phases": [ + "integration", + "forward_annotation" + ], + "recovery_attempts": [], + "release_proof": null, + "write_outcome": { + "save_state": "UNKNOWN", + "close_state": "UNKNOWN", + "helper_state": "EXITED", + "resource_state": "RELEASED", + "interrupted": false, + "detail": "保存返回结果无法确认" + }, + "session_record_path": "F:\\CbbI1113\\d3\\management\\management-6be18dcb186846e78b3220b59631249e\\verify\\verify-53e1561b73fa\\session.json" + } + } + ] + } + ], + "duplicate_conflict": { + "passed": true, + "records": [ + { + "operation": "add", + "library": "F:\\CbbI1113\\library3\\native-add\\fixture\\mentor_lib.lmc", + "name": "1GPHY_RTL8211F", + "partition": "Logical-Physical", + "source": "F:\\CbbI1113\\A\\1GPHY_RTL8211F.prj", + "auto_verify": false, + "stage": "complete", + "status": "UPLOAD_FAILED", + "safe_to_continue": true, + "detail": "同名 CBB 已存在;新增禁止覆盖,请使用明确的同名更新。", + "evidence_path": "F:\\CbbI1113\\d4\\management\\management-f43f218e0dcb41e8bfe09d5f2f69a0a8\\checkpoint.json", + "release_proof": null, + "change_report": null, + "history": [ + { + "stage": "release_check", + "time": "2026-11-13T07:25:51.703695+00:00" + }, + { + "stage": "catalog_before", + "time": "2026-11-13T07:26:22.388154+00:00" + } + ], + "backup_policy": "manual" + } + ], + "target_and_shared_content_unchanged": true, + "catalog": { + "library": "F:\\CbbI1113\\library3\\native-add\\fixture\\mentor_lib.lmc", + "flow": 1, + "entries": [ + { + "name": "1GPHY_RTL8211F", + "partition": "Logical-Physical", + "engineering_identity": { + "top_level_block": "1GPHY_RTL8211F", + "schematic_sha256": "ed969340d9e89875b30c7c0ab175e82a92f965743f798cca297ad8de24a55f94", + "layout_sha256": "61c2107047afd2ce8778028bdc5527cb1e2ca14b13190625a2c9c5397077b4f8" + } + }, + { + "name": "1GPHY_RTL8211F_A", + "partition": "Logical-Physical", + "engineering_identity": { + "top_level_block": "1GPHY_RTL8211F_A", + "schematic_sha256": "400183e788a0980f8e08a140e1eb7f96b845c48cf486e51c90cdb33900688e41", + "layout_sha256": "3b78437a66f3d9a510b7aed6130928629b1b15fa86a8029e1786006e900fb5d5" + } + } + ], + "safe_to_continue": true + } + }, + "source_hashes": { + "src/cbb_refresh_verify/application.py": "62b9b013563a216d020c8366cccb8f949b02afa72dc63c26940804441cc23057", + "src/cbb_refresh_verify/backup_recovery.py": "f07741fdeed73871eda1d4e72803bb516cc877b5b49973e3f7aa18972228baa2", + "src/cbb_refresh_verify/batch_status.py": "55a4007cf54491ca8e045a5bf86aa4353ac8437cca5a76cd79304962e3d3fa0a", + "src/cbb_refresh_verify/com_runtime.py": "f0f3802d16c791a8bf9dfef44a94917072bfbe8fb3a927d76be8ef0341c7ed35", + "src/cbb_refresh_verify/content_check.py": "8239c17b6e2452917ed573a7deb3e4c8583eaef91bf3630eff5f424d2e398aa9", + "src/cbb_refresh_verify/defaults.py": "a1c03192f4a61ad0924b24bb635705b1ee4811d35483a02864200f95edbbebe3", + "src/cbb_refresh_verify/desktop_worker.py": "27d751816552d215dd8ee9cd67941d824f7b4493120ead7c3f87e5eba5ec4a92", + "src/cbb_refresh_verify/diagnostic_open.py": "d6c49ffe5a9969d95edbbc896d47a7e100f248380a287f99ba7bb8b92dbb3072", + "src/cbb_refresh_verify/dialog_agent.py": "5acb6e5cf1350a7ca20a6fe480668435fac785835874f266881973010db6504b", + "src/cbb_refresh_verify/dialog_models.py": "f68cee01d927b48364276d3c1f79e63ce8af231878db0b907d292780cfbafb56", + "src/cbb_refresh_verify/dialog_probe.py": "d61f0c955c961980c9635940eefb9c7947c1fe90b4b6fd844720df41ddb0aa0e", + "src/cbb_refresh_verify/dialog_rules.py": "3189b476f7ff4678b59212ed7b4081164e038a7cf7662cd895f9019cb3c1edc5", + "src/cbb_refresh_verify/dialog_supervisor.py": "15c415c2d2e916f0b64ba04416164ff3b50996d70b22d3b4ac2226b5547ac247", + "src/cbb_refresh_verify/failed_session.py": "7e6f7fa5ebcf2d49f00c5efc5f5d26412704b68e9122e476ac1f672009a98c09", + "src/cbb_refresh_verify/icdb_maintenance.py": "e81d253d8b4d3e7c1000c45335a392c72b110748675c2c3324ebe524a7252e98", + "src/cbb_refresh_verify/icdb_ownership.py": "7bf2342c1efa34a2ebcbf27964a40a490220f7146fbb6ef957b8d8dd1e511f03", + "src/cbb_refresh_verify/icdb_recovery.py": "358c0e9a004f1e0b2127513286e1dffd94b0180a8b7314aa9655462f570b6360", + "src/cbb_refresh_verify/integration.py": "f188856af69ba25e265988c51db7a6d4263326440d972ca78378b733b891c1ed", + "src/cbb_refresh_verify/library_lock.py": "6836ec8ac21e788eb75326ff44cb31ad4bdfb5f381bd35cdf33e6b34c7fca89e", + "src/cbb_refresh_verify/library_manager_verify.py": "71e16a8581ad44b646be78b480f9812d596a6d162b3eec03d078bf4ea4503195", + "src/cbb_refresh_verify/library_reader.py": "d4007caa361edd467773e49f721e02671d5a9bcb30741769a57349850b12c438", + "src/cbb_refresh_verify/maintenance_entry.py": "3b93c25f69d7a961facd8004e20e155a84cc18f06d57b741a9055786ed058990", + "src/cbb_refresh_verify/management.py": "773f9405c39b3fdcea4647da84ca97e9113e03db386a45bfabd468a98ed1fb36", + "src/cbb_refresh_verify/management_transaction.py": "32c53caaead05d5db3a31d3e30721e65434e5837095dc0a7812f825603aa37a0", + "src/cbb_refresh_verify/mentor_adapter.py": "1fc8c98d5508120e03bf001a42dd3e0da7b165eb18c90f1aed83147d17db8638", + "src/cbb_refresh_verify/mentor_paths.py": "ba48c0003b3eacc88906497b2e43b299ca4536a9f7dae44bbacf6a6ec694c116", + "src/cbb_refresh_verify/models.py": "9e8209a8b006df923f1d07ccab64bbcfe5d674c4fc5f5426bfbc9b11da4ee105", + "src/cbb_refresh_verify/native_add_failures.py": "192202732423dc624c5548c75e80bb20973e5087c21d4798c9637f25b6de7e94", + "src/cbb_refresh_verify/native_backup.py": "7276fa3d9298e85550151cf0c7191d84bd08a18a72df5d854a3c38f1a88b001d", + "src/cbb_refresh_verify/native_engineering_identity.py": "e704e8f56c43629a1593d490776af328bb032208ee2f5ffd1d1be6c3114f5412", + "src/cbb_refresh_verify/native_export_guard.py": "c3eeadd557d2f89bfce855c0736c953043ebe97bc81aa74e40bd370780a54741", + "src/cbb_refresh_verify/native_management.py": "5eca3b40ef57ecd4a12a0d0c26afd1bb1afb448a0b7c5452bfe80591a3a74b77", + "src/cbb_refresh_verify/native_occupancy.py": "7d686079d12217382adace6361cd343d977b91075e3b157cf410ca92d07ffc49", + "src/cbb_refresh_verify/native_repair.py": "9f024dcb5e3a76369191033474fefd30787b6ae350c315f3cf38e92e5a1f3e98", + "src/cbb_refresh_verify/native_repair_ui.py": "3eb2af181befea94af8b3b3131edff09589f340bcba777abbe3b67fd31b80393", + "src/cbb_refresh_verify/network_path.py": "6b5b159502d42a46bf4ee26d5698fd2c6498b359088e2138eae46e9065b13c6f", + "src/cbb_refresh_verify/operation_lifecycle.py": "3838c5a501711d16f578c45ebbc6f960872b0c3ba6bbda9a597f994ef746cef6", + "src/cbb_refresh_verify/operation_queue.py": "a6932d8bc68ac436091f6d362557c66d274ec52d0f295a22f014a3396845c79f", + "src/cbb_refresh_verify/owner_probe.py": "8dcfd60246cb2979db34d02e0a2d605c334b6f7e2666f22daa2f50c0408bc903", + "src/cbb_refresh_verify/pcb_bridge.py": "2f6c2b09642100468814500569dbfc6695fc2a46b9a3b8333daa8e1530cdeef5", + "src/cbb_refresh_verify/pcb_open_consent.py": "7ad9c3a183f565b8b1f7a57b7c29ee9cbc3a79fe1ac0d778459edbdcb25b5664", + "src/cbb_refresh_verify/pcb_restore_prompt.py": "39e0b8623a838911eff61066f3e9c8ede4364dbf73efc5a8994197ec72a96488", + "src/cbb_refresh_verify/post_repair_consent.py": "3b1eaff1db58fd311a9dbc5fdcd850911b04cc5afd4e747f70a62b721b8fafa4", + "src/cbb_refresh_verify/post_verify_diagnostics.py": "2442de485bc0d6a34c4b2d9b10bc5f323ea38f9ff66674119a50f5c6043bac63", + "src/cbb_refresh_verify/reimport_recovery.py": "66b2ba8f8c2ec9ae8c386d6b1aa74a1fbb6bfb509c4df0a262f8d7a0ca48469e", + "src/cbb_refresh_verify/residual_sessions.py": "4ac500b33b209611d54eb496c6c30727ba159742d625431ceea84471a5fc3442", + "src/cbb_refresh_verify/runtime_logging.py": "44ac25430a89c5ffc9e48e88c227e88052f4c815365e8556f67918f3edaba39e", + "src/cbb_refresh_verify/runtime_timing.py": "c4ed4057b5000e0b86ccc7dd1fe2004d6e0dae29f397fec77b01ad41a81c6367", + "src/cbb_refresh_verify/scoped_manifest.py": "9318bf0f929d23c18466a25d83a4a9903822093c123aae10510061788c6d0ab7", + "src/cbb_refresh_verify/session_record.py": "2bc3cff365008864584138a4ff13538bb6b2f90d981e7d008a1300f9102c6e7e", + "src/cbb_refresh_verify/status_bridge.py": "05d627d02934a14f5de409472c291d37565a95b836f9c130111aae80612e9196", + "src/cbb_refresh_verify/verify_diagnostics.py": "041b77d7d49e4c86338ed5e5741d0d27a2c42bc358f4da54b3efe64af847e9b8", + "src/cbb_refresh_verify/verify_probe.py": "3ed743df49d195c74f5045985ab23491d103ee2c42c07b558c1e037176402ed2", + "src/cbb_refresh_verify/verify_runner.py": "3027ef7fc1ef6365ff36ae0c83389d869b92ffcd96985d10275bca4dc9483e3f", + "src/cbb_refresh_verify/__init__.py": "dd960394d88657820dba858792abf0de258e05efceb08ae2f0b39c6ad78bc469", + "src/cbb_refresh_verify/__main__.py": "dc4be034a0e43d4b659a9300137c29a6a6b7a32b7eaef02b6dff9a88c41305c0", + "src/cbb_refresh_verify/ui/backup_notice.py": "1a3fa5ac18a267907faf95f36d61b9f08bcbb939eef4d480dd06af1391a81599", + "src/cbb_refresh_verify/ui/backup_recovery_dialog.py": "65081eb8d9791f8ec1316023a80edb07a91b2658b9ed27cb4cf21addb0f26026", + "src/cbb_refresh_verify/ui/icdb_check_task.py": "ade3bf414aa29b42f4c1535c613b2cacb2735f6abc7900e6da25999390a5891d", + "src/cbb_refresh_verify/ui/main_window.py": "af65fcd8e41f35f412e8c23f525821c92b2cfb78b9d0fd4f88c515249dbd24e1", + "src/cbb_refresh_verify/ui/management_dialog.py": "4ae522e8509d9153af9d41d349f1611c80f73c0913f01f33cc5a122665cf56bf", + "src/cbb_refresh_verify/ui/pcb_open_dialog.py": "3cabdc15f1b2abaeb919a7f29f32d4b053186701fd514646d9bdd3ea32f364f6", + "src/cbb_refresh_verify/ui/pcb_restore_dialog.py": "b7228d828df235ac51502dc68760d28c4896af02c780e9806e11c32dba7f62da", + "src/cbb_refresh_verify/ui/residual_release_dialog.py": "1d2a26bfc7ee21b11d7edbc3074b4c525e8c9fb628bca45b08bd06fc672586c8", + "src/cbb_refresh_verify/ui/workers.py": "4cc9360a4820ded27a7d5ef709fc9f04b1d4804cb1e7a614f6c357ed547da888", + "src/cbb_refresh_verify/ui/__init__.py": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + }, + "local_evidence_sha256": { + "F:\\CbbI1113\\full-suite.xml": "df15b248bb4eb21580800d43ce60a5ac4f4bae5a4d3c67580f45f0752472fcab", + "F:\\CbbI1113\\full-suite-final3.xml": "d0702c2a69dab5aef57c4fa7e7f9d633058b3c03dae5970665c393c979476ab6", + "F:\\CbbI1113\\accept.log": "39620df9b61514eed6b1c48edb19d6e1abbb71c1e4c7e7d31f0a7e1968442220", + "F:\\CbbI1113\\accept2.log": "b3d1509d1c6d65973ba4da666103785402aef576c1fe78936c559caaaa02a62d", + "F:\\CbbI1113\\accept2-resume.log": "6c5fb656f12c4e790ca1b3f01593283161bff7f8b253fd4e1444c53f0fb49d91", + "F:\\CbbI1113\\accept3.log": "0a69d374c5ae3652aac7e871578a45f090220cd3d04e8701390d95abd020a8d9", + "F:\\CbbI1113\\auto-verify-trial.json": "8729b9c6f4a48199f2e2515c59bae1891ce61b00a5572a9721dd25e003e196a0", + "F:\\CbbI1113\\accept4.log": "81af1d0a6146b33220dd85996ab7d4b28eee820fa6d8fb30314effea249cd568", + "F:\\CbbI1113\\duplicate-conflict-trial.json": "b7051b3e01102e51c551dde8aade9d358454a97ff91fb547702c8a4dbeb5928e", + "F:\\CbbI1113\\native-add-wait-chain.json": "f671192272d5edcd9ed3ea736b42ea7d330c86adaadc1a5cc434b6c55fb270c1" + }, + "independent_review": "No actionable findings; static review only; three updates reviewed.", + "cloud_beta2_updated": false, + "schematic_semantic_equivalence_checked": false, + "known_limits": [ + "Automatic ICDB Repair disabled; field lost-session recovery unverified.", + "Windows 10 and cross-machine SMB unverified.", + "Long native Add waits observed; root cause not determined; not claimed fixed." + ] +} \ No newline at end of file diff --git a/docs/releases/2026-11-13-import-decoupling.md b/docs/releases/2026-11-13-import-decoupling.md new file mode 100644 index 0000000..722c3f0 --- /dev/null +++ b/docs/releases/2026-11-13-import-decoupling.md @@ -0,0 +1,57 @@ +# 2026-11-13:CBB 导入与附加核验解耦 + +分支:`codex/import-without-export-gate`;基线 main:`cbc57238496bc84f4228aa44929208a9516dff1b`。 +原始工程、运行日志、截图、测试 XML 和冻结包保留在本机 `F:\CbbI1113`;仓库只保存说明和验证摘要。 + +## 原因与修改 + +此前导入会在原生 Add 之前和之后强制执行 ASCII、CSV、EDIF 内容导出;能力探测也依赖这些导出器。因此 EDIF 导出崩溃能让本来尚未执行 Add 的工程显示“上传失败”,取消上传后自动校验也不能避开它。 + +- 新增、同名替换和隔离管理适配器均不再调用或要求安装这些导出器。独立导出诊断代码保留,EDIF 崩溃根因没有被宣称解决。 +- 保留完整来源暂存及复制核验、事务随机标识、检查点、库基线、精确进程和租约验证、原生成功回执以及重新读库。只在暂存副本中重定位库引用,来源旧库地址失效不会拒绝向明确选择的新库导入。 +- 上传完成必须确认目标库、名称、分区、工程关联、顶层块和 Layout。顶层块允许保持来源名或被原生导入改成本次注册名;真实映射与实际目标身份保留在证据中,不能接受第三个名称。 +- PRJ 路径规范化、默认标记、历史/其他工程文件的差异单独保存 `assets_match` 和增删改清单,并提示核对;不再以全文件相等判定上传失败。Layout 不一致、关联错误或结构缺失仍拒绝确认。 +- 不比较原生重写后的 ICDB 原始字节,也不再声称证明了原理图语义等价。`identity_proof` 保存实际复读结果,没有伪造为来源内容。 +- 上传后 Verify 保持独立可选;只有 PASS、权威 GREEN/READY 和释放确认才能记录 `UPLOADED_VERIFIED`。否则区分 `UPLOADED` 与 `UPLOADED_VERIFY_FAILED`。 +- 来源或名称错误按行进入结果,其他有效条目继续。界面仍拒绝同批重复目标,避免对同一目标提交含糊的多次变更。单项失败先复核释放,只有未释放的相关库暂停后续写入;不绕过真实数据库占用。 + +## 回归与代码复核 + +新增用例先复现:导出器缺失导致能力禁用、导入调用附加导出、单行无效来源挡住批次、旧库地址失效、原生 PRJ 改写以及原生顶层块改名误报失败。保留陌生顶层块和 Layout 差异的拒绝用例,以及上传后 Verify 失败时安全继续下一项的用例。 + +最终源码全量回归 **1,895 passed**,1 条既有 pywinauto STA COM 警告;编译检查通过。冻结包的 64 个应用模块、资产和 EXE 图标与源码一致。独立只读代码复核没有发现待修正项;该复核没有执行原生操作。 + +第一轮全量运行有 15 项失败:子进程使用了机器 editable 安装的原始工作目录,而不是本隔离工作区。该轮不计为通过;显式设置 `PYTHONPATH` 到本工作区 `src` 后,全套通过。后续测试与原生试验均固定此路径,未更改用户 Python 安装。 + +## 实机中保留的失败 + +- 第一轮冻结包在全新隔离库实际成功新增 A/B,但 PRJ 自动规范化及历史事件冲突副本缺失被旧的全资产相等规则误报为 `RECOVERY_REQUIRED`。已增加差异证据及回归;该轮不算整体验收通过。 +- 第二轮实际选择文件后移走一个测试文件、取消确认后重试并连点执行:失效行显示失败,A 随后 `UPLOADED`,B 的原生 Add 也成功。B 被后续“目标顶层块必须等于来源”检查误报为需恢复;已按本次原生命名变换修订。两项都确认释放,主程序最后正常退出 0。该轮同样不算全部通过。 +- 原生 Add 曾长时间等待。窗口、进程与等待链证据保留;没有确定底层原因,不宣称已修复耗时,也不强制结束原生写入来得到成功结果。 + +## 最新冻结包的实际批量链路 + +候选程序:`F:\CbbI1113\candidate3\dist\CbbRefreshVerify-Background\CbbRefreshVerify.exe`。 +SHA-256:`98a642d8e81f42b708934bb4dc2d023c49c2acdae5851151a430f101c74c9615`。 + +第三轮从应用真实按钮和文件选择器向全新空隔离库依次导入 B、A,开启上传后自动校验;没有替换原生适配器,没有前台鼠标接管,也没有强制结束进程或删除原生地址/锁文件。 + +| 步骤 | 实际结果 | +| --- | --- | +| B 的原生 Add 与复读 | 原生明确成功,库/名称/分区及工程关联确认;Layout 一致;顶层块从 `1GPHY_RTL8211F` 变为本次注册名 `1GPHY_RTL8211F_A`,映射保留,上传确认通过。 | +| B 的上传后 Verify | `MENTOR_PROJECT_INTEGRATION / forward_annotation`,原文 `There are no PartsDB partitions from which to extract parts`。空库没有 PartsDB,不能创建本地 PDB;记录 `UPLOADED_VERIFY_FAILED`、safe=true,不记为上传失败或 READY。 | +| B 失败后的同批 A | 实际继续执行 A 的原生 Add,注册及 Layout 复读通过;没有因为 B 的 Verify 失败停掉整批。 | +| A 的上传后 Verify | 同样因空库缺 PartsDB 返回 `UPLOADED_VERIFY_FAILED`、safe=true。没有把失败伪造成 READY。 | +| 独立目录读取 | 重新启动原生 Library Manager,确认两个正确名称均存在。 | +| 来源与退出 | 两份输入主要内容清单未变;原生会话释放,应用正常退出 0;整条试验控制器退出 0。 | +| 附加导出 | 本批未生成 ASCII/CSV/EDIF 导出进程记录;对应自动化回归也禁止普通导入调用这些导出边界。 | + +第三轮原始证据:`accept3.log`、`auto-verify-trial.json`、`d3/management/*/checkpoint.json`、各项 `add/identity-comparison.json` 及 `verify/*/result.json`。此试验验证真实上传和“校验失败后释放并继续”的负向场景;**不是多个新增项在依赖完整的中心库中全部达到 READY 的验收**。 + +第四轮从同一最新冻结包重新打开该库,实际再次新增已有的 A:取消后重新确认、执行中连点均未重复提交;原生目录确认同名后返回 `UPLOAD_FAILED`、safe=true,检查点没有 `native_add` 阶段。目标及共享主要工程内容清单前后完全一致;独立原生目录仍只有 A/B,程序正常退出 0。证据为 `accept4.log`、`duplicate-conflict-trial.json` 和 `d4/management/*/checkpoint.json`。 + +机器可读摘要见同目录 `2026-11-13-import-decoupling-validation.json`。最初两轮发现问题的包及失败记录没有覆盖或改为成功。 + +## 范围 + +未更新云端既有 `v0.2.4-beta.2`,未合并 main 或关闭工单。自动 ICDB Repair 保持禁用。现场失联故障、Windows 10、跨机器共享库及任意工程内容的完整语义等价仍不在已验证结论中。 diff --git a/src/cbb_refresh_verify/management.py b/src/cbb_refresh_verify/management.py index 5747d88..5a4096c 100644 --- a/src/cbb_refresh_verify/management.py +++ b/src/cbb_refresh_verify/management.py @@ -389,16 +389,24 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro owner_safe = after.safe_to_continue matches = [entry for entry in after.entries if entry.name == request.name and entry.partition == request.partition] - proof_matches = (native.identity_matches is True and native.identity_proof == identity + expected_proof, registered_proof = identity, native.identity_proof + if isinstance(identity, dict) and identity.get('policy') == 'mentor795-import-assets-v1': + expected_proof = {key: value for key, value in identity.items() if key != 'assets'} + registered_proof = ({key: value for key, value in registered_proof.items() if key != 'assets'} + if isinstance(registered_proof, dict) else None) + # Library Manager may name the imported top block after the CBB. + if registered_proof is not None and registered_proof.get('top_level_block') == request.name: + expected_proof['top_level_block'] = request.name + proof_matches = (native.identity_matches is True and registered_proof == expected_proof if hasattr(adapter, 'prepare_add_transaction') else len(matches) == 1 and matches[0].engineering_identity == identity) if (not owner_safe or Path(after.library).resolve() != canonical_library or after.flow != 1 or len(matches) != 1 or not proof_matches): - return finish('RECOVERY_REQUIRED', '原生新增后名称、分区或来源工程内容未确认一致。', owner_safe) + return finish('RECOVERY_REQUIRED', '原生新增后名称、分区或工程关联未确认一致。\n'+native.detail, owner_safe) uploaded = True checkpoint('uploaded') if not request.auto_verify: - return finish('UPLOADED', '上传已确认;本批次未启用自动校验。') + return finish('UPLOADED', '上传已确认;本批次未启用自动校验。\n'+native.detail) # Adapter catalog cannot return until its exact native owner exits. checkpoint('verify') owner_safe = False @@ -410,7 +418,7 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro checkpoint('verified', verification=asdict(verified)) good = verified.status == 'PASS' and verified.library_flag == 'GREEN' and owner_safe return finish('UPLOADED_VERIFIED' if good else 'UPLOADED_VERIFY_FAILED', - verified.stderr or verified.library_flag_detail, owner_safe) + '\n'.join(filter(None, (native.detail, verified.stderr or verified.library_flag_detail))), owner_safe) except Exception as error: if uploaded: return finish('UPLOADED_VERIFY_FAILED', str(error), owner_safe) diff --git a/src/cbb_refresh_verify/native_engineering_identity.py b/src/cbb_refresh_verify/native_engineering_identity.py index 567c3b3..b0957d9 100644 --- a/src/cbb_refresh_verify/native_engineering_identity.py +++ b/src/cbb_refresh_verify/native_engineering_identity.py @@ -191,17 +191,21 @@ def _normalized_project(path, expected_library): data = path.read_bytes(); encoding = _project_encoding(data) text = data.decode(encoding) refs = re.findall(r'^KEY CentralLibrary "([^"\r\n]*)"', text, re.M) - if not refs or any((path.parent/value).resolve() != expected_library.resolve() for value in refs): + if (not refs or any(not value.strip() for value in refs) + or expected_library is not None and any( + (path.parent/value).resolve() != expected_library.resolve() for value in refs)): raise ValueError(f'CentralLibrary reference does not resolve to the approved library: {path}') return re.sub(r'(?m)^(KEY CentralLibrary ")[^"\r\n]*(")', r'\1\2', text).encode(encoding) def asset_identity(source, expected_library): + """Normalize old library paths when None; imported projects require the exact target.""" from .backup_recovery import _project_text source, pcb, top = source_project(source) - expected_library = Path(expected_library) - if not expected_library.is_file(): raise ValueError('Approved CentralLibrary is missing.') + expected_library = Path(expected_library) if expected_library is not None else None + if expected_library is not None and not expected_library.is_file(): + raise ValueError('Approved CentralLibrary is missing.') root = source.parent from .maintenance_entry import maintenance_project_files projects = maintenance_project_files(source, pcb) @@ -236,6 +240,21 @@ def asset_identity(source, expected_library): 'layout_sha256': hash_file(pcb.parent/'Layout/LayoutDB.lyt'), 'assets': assets} +def capture_registration_identity(source, evidence_root, *, expected_library): + """File-only import evidence; native database normalization is not semantic proof.""" + root = Path(evidence_root) + try: + root.mkdir(parents=True, exist_ok=False) + identity = {**asset_identity(source, expected_library), + 'policy': 'mentor795-import-assets-v1', + 'coverage': {'primary_assets_checked': True, + 'schematic_semantics_checked': False}} + _write_json(root/'identity.json', {'identity': identity, 'safe_to_continue': True}) + return IdentityOutcome(identity, True, 'Engineering files and project references checked; no native export.', root) + except Exception as error: + return IdentityOutcome(None, True, str(error), root) + + def check_exporters(mentor_home): for name, expected in EXPORTER_PROOF.items(): path = Path(mentor_home)/('wv/win32/bin' if name == 'edifExporter.exe' else 'iCDB/win32/bin')/name diff --git a/src/cbb_refresh_verify/native_management.py b/src/cbb_refresh_verify/native_management.py index 3515d52..21c762f 100644 --- a/src/cbb_refresh_verify/native_management.py +++ b/src/cbb_refresh_verify/native_management.py @@ -1,7 +1,7 @@ -"""Version-pinned native adapter, private desktop transport and strict catalog. +"""Version-pinned native import/removal, private desktop transport and catalog. -The installed Tcl CleanWGLib/F4 contract has isolated removal proof. Discovery -of an Add dialog is deliberately insufficient to enable production Add/Update. +Normal import checks native registration and engineering files without invoking +the independent schematic exporters. Optional Verify determines READY. """ from dataclasses import asdict, replace import ctypes @@ -131,17 +131,12 @@ class NativeManagementAdapter: def capabilities(self): reason = self._binary_capability() - add_reason = reason - if not add_reason: - from .native_engineering_identity import check_exporters - try: check_exporters(self.home) - except (ValueError, OSError, TypeError) as error: add_reason = str(error) return { 'remove': Capability(not reason, reason or '已验证 CleanWGLib/F4;仅 ASCII 名称、Logical-Physical 和 DxDesigner 库。'), - 'add': Capability(not add_reason and _PRODUCTION_ADD_VALIDATED, add_reason or - '已验证 EE7.9.5 原生导入及完整工程复读;仅 ASCII 名称、Logical-Physical 和 DxDesigner 库。'), - 'update': Capability(not add_reason and _PRODUCTION_ADD_VALIDATED and _PRODUCTION_UPDATE_VALIDATED, - add_reason or '已验证同名原生替换:移除并重新导入;操作前请手动备份。'), + 'add': Capability(not reason and _PRODUCTION_ADD_VALIDATED, reason or + 'EE7.9.5 原生导入及工程关联复读;仅 ASCII 名称、Logical-Physical 和 DxDesigner 库。'), + 'update': Capability(not reason and _PRODUCTION_ADD_VALIDATED and _PRODUCTION_UPDATE_VALIDATED, + reason or '同名原生替换:移除并重新导入;操作前请手动备份。'), } def _worker(self, job, evidence): @@ -310,7 +305,7 @@ class NativeManagementAdapter: return self._add_transaction(request, Path(evidence)) def prepare_add_transaction(self, request, root, *, original_source): - from .native_engineering_identity import project_library, asset_identity, capture_identity, IdentityOutcome + from .native_engineering_identity import asset_identity, capture_registration_identity, IdentityOutcome from .native_add_failures import validate_native_copy_paths from .management_transaction import current_lease, prepare_transaction from .management import source_project @@ -320,7 +315,8 @@ class NativeManagementAdapter: 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)) + # The selected destination replaces old library paths in the staged copy. + original_assets = asset_identity(original_source, None) 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.') @@ -329,8 +325,7 @@ class NativeManagementAdapter: raise ValueError('Staged engineering assets differ from the original source.') except Exception as error: return request, IdentityOutcome(None, True, str(error), Path(root)) - proof = capture_identity(staged, Path(root)/'source-identity', expected_library=request.library, - owner_library=request.library, mentor_home=self.home, timeout_seconds=request.timeout_seconds) + proof = capture_registration_identity(staged, Path(root)/'source-identity', expected_library=request.library) if proof.identity is None or not proof.safe_to_continue: return request, proof try: @@ -344,7 +339,7 @@ class NativeManagementAdapter: 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 .native_engineering_identity import capture_registration_identity, project_library from .management import source_project from .backup_recovery import _align_library, _idle_check try: @@ -383,7 +378,7 @@ class NativeManagementAdapter: if len(projects) != 1: return NativeOutcome(True, owner_safe, 'Registered engineering project is not unique.', identity_matches=False, evidence_path=evidence) - target, pcb, _ = source_project(projects[0], request.top_level_block) + target, pcb, _ = source_project(projects[0]) _idle_check(request.library, target, pcb) from .maintenance_entry import maintenance_project_files project_files = maintenance_project_files(target, pcb) @@ -401,18 +396,31 @@ class NativeManagementAdapter: or catalog.flow != 1 or len(entries) != 1): return NativeOutcome(True, owner_safe, 'Aligned target did not reopen with the exact catalog identity.', identity_matches=False, evidence_path=evidence) - owner_safe = False - proof = capture_identity(target, evidence/'registered-identity', expected_library=request.library, - owner_library=request.library, mentor_home=self.home, timeout_seconds=request.timeout_seconds) + proof = capture_registration_identity(target, evidence/'registered-identity', expected_library=request.library) owner_safe = proof.safe_to_continue - matched = proof.identity is not None and proof.identity == prepared['expected_identity'] + expected, registered = prepared['expected_identity'], proof.identity + # Native Add rewrites PRJ metadata and runtime history. Registration + # identity uses the top block and Layout; other file diffs are evidence. + allowed_tops = (expected['top_level_block'], request.name) + matched = (registered is not None and registered['top_level_block'] in allowed_tops + and registered['layout_sha256'] == expected['layout_sha256']) + before_assets, after_assets = expected['assets'], (registered or {}).get('assets', {}) + differences = {'added': sorted(after_assets.keys()-before_assets.keys()), + 'deleted': sorted(before_assets.keys()-after_assets.keys()), + 'modified': sorted(key for key in before_assets.keys() & after_assets.keys() + if before_assets[key] != after_assets[key])} + assets_match = registered is not None and not any(differences.values()) _write_json(evidence/'identity-comparison.json', {'identity_matches': matched, - 'expected': prepared['expected_identity'], 'registered': proof.identity, + 'assets_match': assets_match, 'asset_differences': differences, + 'top_level_block_mapping': {'source': expected['top_level_block'], + 'registered': (registered or {}).get('top_level_block'), 'allowed': list(allowed_tops)}, + 'expected': expected, 'registered': registered, 'safe_to_continue': owner_safe, 'detail': proof.detail}) return NativeOutcome(True, owner_safe, - 'Native ASCII/CSV/EDIF, physical assets and library references match.' if matched else - 'Native registration succeeded but complete engineering identity proof did not match: '+proof.detail, - identity_matches=matched, evidence_path=evidence, identity_proof=proof.identity) + ('原生注册、工程关联、顶层块和 Layout 已确认;未核验原理图语义。' + + ('其他工程文件有差异,已记录供核对。' if not assets_match else '')) if matched else + '原生注册成功,但工程关联、顶层块或 Layout 未确认一致:'+proof.detail, + identity_matches=matched, evidence_path=evidence, identity_proof=registered) def add_owned_fixture(self, request, evidence, *, probe_token): """Research only: stage and back up a token-bound, actively leased fixture.""" @@ -463,13 +471,10 @@ class _OwnedFixtureManagementAdapter(NativeManagementAdapter): def capabilities(self): from .management_transaction import fixture_authority - from .native_engineering_identity import check_exporters fixture = self._fixture_authority fixture_authority(fixture['root'], Path(fixture['root'])/'native-add/fixture/mentor_lib.lmc', fixture['token']) caps = super().capabilities() reason = self._binary_capability() - try: check_exporters(self.home) - except (ValueError, OSError) as error: reason = str(error) for operation in ('add', 'update'): caps[operation] = Capability(not reason, reason or 'Owned fixture engine validation only; production capability unchanged.') return caps diff --git a/src/cbb_refresh_verify/ui/management_dialog.py b/src/cbb_refresh_verify/ui/management_dialog.py index bf78499..2fcf272 100644 --- a/src/cbb_refresh_verify/ui/management_dialog.py +++ b/src/cbb_refresh_verify/ui/management_dialog.py @@ -9,7 +9,7 @@ from PySide6.QtWidgets import (QCheckBox, QDialog, QFileDialog, QHBoxLayout, QLa from .workers import ServiceWorker from .backup_notice import MANUAL_BACKUP_NOTICE -from ..management import run_management_batch, validate_name +from ..management import run_management_batch RESULT_LABELS = { 'REMOVED': '已移除', 'UPLOADED': '已上传 / 未自动校验', @@ -18,7 +18,7 @@ RESULT_LABELS = { 'BLOCKED': '操作被阻止', 'UNSUPPORTED': '当前环境不支持', } STAGE_LABELS = { - 'prepare_identity': '正在核对来源工程内容', + 'prepare_identity': '正在检查来源工程文件', 'catalog_before': '正在核对原生目录', 'baseline': '正在记录中心库内容基线', 'stage_source': '正在复制并检查来源工程', 'native_remove': '正在移除', 'removed': '原条目已移除', 'native_add': '正在上传', 'uploaded': '上传已确认', @@ -150,10 +150,7 @@ class ManagementDialog(QDialog): try: if not requests: raise ValueError('请先选择来源工程。') - for request in requests: - validate_name(request.name) - if request.operation != 'remove' and (request.source is None or not request.source.is_file()): - raise ValueError(f'{request.name}:请选择完整来源 PRJ。') + # Per-item input errors belong in batch results, so valid rows still run. if len({(r.partition.casefold(), r.name.casefold()) for r in requests}) != len(requests): raise ValueError('批次包含重复目标名称。') except ValueError as error: diff --git a/tests/test_import_without_export_gate.py b/tests/test_import_without_export_gate.py new file mode 100644 index 0000000..ed7f911 --- /dev/null +++ b/tests/test_import_without_export_gate.py @@ -0,0 +1,124 @@ +"""Normal imports must not depend on optional schematic export tools.""" +from dataclasses import replace +import json + +import pytest + +from test_management_native_transaction import transaction, execute +from test_management import setup + + +def test_import_capability_does_not_require_exporters(tmp_path, monkeypatch): + import cbb_refresh_verify.native_management as native + import cbb_refresh_verify.native_engineering_identity as identity + monkeypatch.setattr(native.NativeManagementAdapter, '_binary_capability', lambda _: '') + def missing(*_): + raise ValueError('edifExporter.exe is not installed') + monkeypatch.setattr(identity, 'check_exporters', missing) + caps = native.NativeManagementAdapter(mentor_home=tmp_path).capabilities() + assert caps['add'].supported and caps['update'].supported + + +@pytest.mark.parametrize('auto_verify', [False, True]) +def test_real_engine_imports_without_any_native_export(transaction, monkeypatch, auto_verify): + import cbb_refresh_verify.native_engineering_identity as identity + from cbb_refresh_verify.verify_runner import VerifyResult + root, request, state = transaction + def forbidden(*_a, **_kw): + raise AssertionError('An optional native exporter was called by import') + monkeypatch.setattr(identity, 'capture_identity', forbidden) + monkeypatch.setattr(identity, 'check_exporters', forbidden) + verified = [] + def verify(request, **_): + verified.append(request.block_name) + return VerifyResult('PASS', library_flag='GREEN', library_flag_detail='READY') + monkeypatch.setattr('cbb_refresh_verify.verify_runner.run_verify', verify) + result = execute(root, replace(request, auto_verify=auto_verify)) + assert result.status == ('UPLOADED_VERIFIED' if auto_verify else 'UPLOADED'), result.detail + assert result.safe_to_continue + assert verified == (['Block'] if auto_verify else []) + proof = json.loads((result.evidence_path.parent/'source-identity/identity.json').read_text()) + assert proof['identity']['coverage']['schematic_semantics_checked'] is False + assert 'edif_sha256' not in proof['identity'] + assert 'add' in state['calls'] + + +def test_bad_source_row_does_not_prevent_valid_rows_from_starting(qtbot, tmp_path, monkeypatch): + from PySide6.QtWidgets import QMessageBox + from cbb_refresh_verify.management import ManagementRequest, ManagementResult + from cbb_refresh_verify.ui.management_dialog import ManagementDialog + good = tmp_path/'good.prj'; good.write_text('fixture') + rows = [ManagementRequest('add', tmp_path/'lib.lmc', 'Missing', source=tmp_path/'missing.prj'), + ManagementRequest('add', tmp_path/'lib.lmc', 'Good', source=good)] + seen = [] + def runner(requests, **_): + seen.extend(requests) + return [ManagementResult(r.operation, r.library, r.name, r.partition, r.source, + r.auto_verify, 'complete', 'UPLOAD_FAILED' if r.name == 'Missing' else 'UPLOADED', + True, 'per-item result') for r in requests] + dialog = ManagementDialog(rows, runner=runner); qtbot.addWidget(dialog) + monkeypatch.setattr(QMessageBox, 'question', lambda *_a, **_kw: QMessageBox.Yes) + dialog.execute_button.click() + qtbot.waitUntil(lambda: bool(seen) and not dialog.busy) + assert [r.name for r in seen] == ['Missing', 'Good'] + + +def test_import_retargets_old_library_reference_without_requiring_old_library(transaction): + root, request, state = transaction + for path in (request.source, request.source.parent/'PCB/pcb.prj'): + text = path.read_text() + path.write_text(text.replace(str(request.library), str(root/'unavailable-old-library.lmc'))) + before = request.source.read_bytes() + result = execute(root, request) + assert result.status == 'UPLOADED' and result.safe_to_continue, result.detail + assert request.source.read_bytes() == before + + +def test_input_and_optional_verify_failures_do_not_skip_later_imports(setup, tmp_path): + from cbb_refresh_verify.management import run_management_batch + from cbb_refresh_verify.verify_runner import VerifyResult + request, adapter, source = setup + results = run_management_batch([ + replace(request, operation='add', name='Bad', source=tmp_path/'absent.prj'), + replace(request, operation='add', name='First', source=source, auto_verify=True), + replace(request, operation='add', name='Second', source=source, auto_verify=False)], + adapter=adapter, idle_check=lambda *_: None, + verifier=lambda *_a, **_kw: VerifyResult('FAIL', stderr='Optional Verify did not pass')) + assert [r.status for r in results] == ['UPLOAD_FAILED', 'UPLOADED_VERIFY_FAILED', 'UPLOADED'] + assert all(r.safe_to_continue for r in results) + assert len(adapter.calls) == 2 + + +def test_native_project_normalization_is_a_recorded_difference_not_import_failure(transaction, monkeypatch): + import cbb_refresh_verify.native_management as native + root, request, state = transaction + original_worker = native.NativeManagementAdapter._worker + def worker(adapter, job, evidence): + result = original_worker(adapter, job, evidence) + if job['operation'] == 'add' and result.get('success'): + project = request.library.parent/'ReusableBlocksLP/Block/Work/Source.prj' + with project.open('a') as stream: + stream.write('SECTION VBPCBIndicators\nKEY VBPCBForwardAnno "0"\nKEY CADBackAnno "0"\nENDSECTION\n') + return result + monkeypatch.setattr(native.NativeManagementAdapter, '_worker', worker) + result = execute(root, request) + assert result.status == 'UPLOADED' and result.safe_to_continue, result.detail + comparison = json.loads((result.evidence_path.parent/'add/identity-comparison.json').read_text()) + assert comparison['identity_matches'] and not comparison['assets_match'] + assert 'Source.prj' in comparison['asset_differences']['modified'] + + +@pytest.mark.parametrize('registered_top,expected', [('Block', 'UPLOADED'), ('Foreign', 'RECOVERY_REQUIRED')]) +def test_native_top_block_may_match_registration_name_but_not_an_unrelated_name(transaction, monkeypatch, registered_top, expected): + import cbb_refresh_verify.native_management as native + root, request, state = transaction + original_worker = native.NativeManagementAdapter._worker + def worker(adapter, job, evidence): + result = original_worker(adapter, job, evidence) + if job['operation'] == 'add' and result.get('success'): + project = request.library.parent/'ReusableBlocksLP/Block/Work/Source.prj' + project.write_text(project.read_text().replace('KEY RootBlock "Top"', f'KEY RootBlock "{registered_top}"')) + return result + monkeypatch.setattr(native.NativeManagementAdapter, '_worker', worker) + result = execute(root, request) + assert result.status == expected and result.safe_to_continue, result.detail diff --git a/tests/test_management_native_transaction.py b/tests/test_management_native_transaction.py index 4ceb228..f3dac02 100644 --- a/tests/test_management_native_transaction.py +++ b/tests/test_management_native_transaction.py @@ -1,4 +1,4 @@ -"""Run the real management engine with only the native/export boundaries faked.""" +"""Run the real management engine with only the native COM/command boundary faked.""" from dataclasses import replace import json from pathlib import Path @@ -11,9 +11,8 @@ import pytest def transaction(tmp_path, monkeypatch): from test_management import project import cbb_refresh_verify.native_management as native - import cbb_refresh_verify.native_engineering_identity as identity import cbb_refresh_verify.backup_recovery as recovery - from cbb_refresh_verify.management import ManagementRequest, engineering_identity, _write_json + from cbb_refresh_verify.management import ManagementRequest, engineering_identity from cbb_refresh_verify.management_transaction import validate_transaction root = tmp_path/'probe' library = root/'native-add/fixture/mentor_lib.lmc' @@ -24,15 +23,7 @@ def transaction(tmp_path, monkeypatch): with path.open('a') as stream: stream.write(f'KEY CentralLibrary "{library}"\n') state = {'entries': [], 'calls': [], 'corrupt': False, 'fail_add': False} monkeypatch.setattr(native.NativeManagementAdapter, '_binary_capability', lambda _: '') - monkeypatch.setattr(identity, 'check_exporters', lambda _: None) monkeypatch.setattr(recovery, '_idle_check', lambda *_: None) - def capture(source, evidence, *, expected_library, **kwargs): - evidence = Path(evidence); evidence.mkdir(parents=True, exist_ok=False) - value = identity.asset_identity(source, expected_library) - value.update(ascii_sha256='logical', csv={'work/identity': 'tables'}, edif_sha256='geometry') - _write_json(evidence/'identity.json', {'identity': value, 'safe_to_continue': True}) - return identity.IdentityOutcome(value, True, 'file-only export proof', evidence) - monkeypatch.setattr(identity, 'capture_identity', capture) def worker(adapter, job, evidence): evidence = Path(evidence); evidence.mkdir(parents=True, exist_ok=False) state['calls'].append(job['operation']) @@ -102,15 +93,25 @@ def test_owned_fixture_engine_add_conflict_update_remove_and_identity(transactio assert request.source.read_bytes() == original -@pytest.mark.parametrize('corrupt', [True, 'unknown_cdbsvr']) -def test_native_registered_but_asset_mismatch_retains_recovery(transaction, corrupt): +def test_native_registered_but_layout_mismatch_retains_recovery(transaction): root, request, state = transaction - state['corrupt'] = corrupt + state['corrupt'] = True result = execute(root, request) assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue assert execute(root, request).status == 'BLOCKED' +def test_native_registered_with_additional_file_records_difference_without_blocking(transaction): + root, request, state = transaction + state['corrupt'] = 'unknown_cdbsvr' + result = execute(root, request) + assert result.status == 'UPLOADED' and result.safe_to_continue + comparison = json.loads((result.evidence_path.parent/'add/identity-comparison.json').read_text()) + assert comparison['identity_matches'] and not comparison['assets_match'] + assert comparison['asset_differences']['added'] == ['database/cdbsvr/persistent.dat'] + assert '差异' in result.detail + + def test_update_readd_failure_preserves_baseline_and_removed_checkpoint(transaction): root, request, state = transaction assert execute(root, request).status == 'UPLOADED' diff --git a/tests/test_management_ui.py b/tests/test_management_ui.py index ef2c1d2..6f85ac6 100644 --- a/tests/test_management_ui.py +++ b/tests/test_management_ui.py @@ -62,7 +62,7 @@ def test_add_dialog_default_auto_verify_and_source_identity_rows(qtbot, tmp_path dialog.auto_verify.setChecked(False) assert not any(r.auto_verify for r in dialog.requests()) dialog._progress({'stage': 'prepare_identity', 'block': 'One'}) - assert '正在核对来源工程内容' in dialog.status_label.text() + assert '正在检查来源工程文件' in dialog.status_label.text() assert 'prepare_identity' not in dialog.status_label.text() diff --git a/tests/test_native_management.py b/tests/test_native_management.py index 5f86cc6..6a60632 100644 --- a/tests/test_native_management.py +++ b/tests/test_native_management.py @@ -173,16 +173,17 @@ def test_add_route_readiness_is_separate_from_conservative_capability_gate(tmp_p import cbb_refresh_verify.native_management as native proof = {'lm/win32/bin/CleanWGLib.exe': hashlib.sha256(b'verified').hexdigest()} monkeypatch.setattr(native, '_BINARY_PROOF', proof) + monkeypatch.setattr(native, '_PRODUCTION_ADD_VALIDATED', False) path = tmp_path/next(iter(proof)); path.parent.mkdir(parents=True); path.write_bytes(b'verified') adapter = native.NativeManagementAdapter(mentor_home=tmp_path) assert adapter.route_capabilities()['add'].supported assert not adapter.capabilities()['add'].supported - assert 'icdb2ascii' in adapter.capabilities()['add'].reason + assert not adapter.capabilities()['update'].supported @pytest.mark.parametrize('bad', [None, 'CleanWGLib.exe', 'LibraryManager.exe', 'LMCDLL70.dll', 'LMCDocAddin70.dll', 'icdb2ascii.exe', 'icdb2csv.exe', 'edifExporter.exe']) -def test_public_crud_requires_pinned_core_and_every_identity_exporter(tmp_path, monkeypatch, bad): +def test_public_crud_requires_pinned_core_but_not_identity_exporters(tmp_path, monkeypatch, bad): import hashlib import cbb_refresh_verify.native_management as native import cbb_refresh_verify.native_engineering_identity as identity @@ -198,8 +199,8 @@ def test_public_crud_requires_pinned_core_and_every_identity_exporter(tmp_path, if bad: next(tmp_path.rglob(bad)).write_bytes(b'changed binary') caps = native.NativeManagementAdapter(mentor_home=tmp_path).capabilities() - assert caps['add'].supported is (bad is None) - assert caps['update'].supported is (bad is None) + assert caps['add'].supported is (bad is None or bad in exporters) + assert caps['update'].supported is (bad is None or bad in exporters) if bad in exporters: assert caps['remove'].supported @@ -399,9 +400,10 @@ def test_production_caps_require_all_validated_binary_hashes(tmp_path, monkeypat path = tmp_path/next(iter(proof)); path.parent.mkdir(parents=True); path.write_bytes(b'verified') adapter = native.NativeManagementAdapter(mentor_home=tmp_path) assert adapter.capabilities()['remove'].supported - assert not adapter.capabilities()['add'].supported + assert adapter.capabilities()['add'].supported path.write_bytes(b'different') assert not adapter.capabilities()['remove'].supported + assert not adapter.capabilities()['add'].supported def test_probe_readd_requires_creation_token_and_fixed_owned_library(tmp_path):