From 7c27f9604e0cdead682bc3dd5f424b990e1e2184 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: Tue, 17 Nov 2026 01:38:35 +0800 Subject: [PATCH] fix: permit fresh confirmed recovery after scoped release proof --- src/cbb_refresh_verify/management.py | 11 ++- src/cbb_refresh_verify/native_management.py | 8 ++- .../ui/management_dialog.py | 3 +- ...test_issue15_confirmed_management_retry.py | 68 +++++++++++++++++++ tests/test_issue15_native_source_name.py | 20 ++++++ tests/test_management_retry_blockers.py | 2 +- 6 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 tests/test_issue15_confirmed_management_retry.py diff --git a/src/cbb_refresh_verify/management.py b/src/cbb_refresh_verify/management.py index 9e7ecea..a03ac44 100644 --- a/src/cbb_refresh_verify/management.py +++ b/src/cbb_refresh_verify/management.py @@ -307,7 +307,16 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro if release_proof is not None: checkpoint('release_check', release_proof=release_proof) if unfinished_target: - return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}') + from .session_record import _proof_covers_session + fresh = (request.check_previous_release and isinstance(release_proof, dict) + and _proof_covers_session(release_proof, {'library': str(library), 'block': request.name}) + and bool(release_proof.get('evidence_path')) + and Path(release_proof['evidence_path']).resolve().is_relative_to((root/'previous-release').resolve()) + and Path(release_proof['evidence_path']).is_file()) + if not fresh: + return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}') + checkpoint('release_check', confirmed_new_request=True, + previous_failed_operation=unfinished_target['evidence_path']) if hasattr(adapter, 'bind_library_mapping'): adapter.bind_library_mapping(request.mapped_drive, request.mapped_remote_root) if hasattr(adapter,'bind_write_admission'): diff --git a/src/cbb_refresh_verify/native_management.py b/src/cbb_refresh_verify/native_management.py index d31a8bc..9c68633 100644 --- a/src/cbb_refresh_verify/native_management.py +++ b/src/cbb_refresh_verify/native_management.py @@ -310,13 +310,15 @@ class NativeManagementAdapter: raise ValueError('仅验证了 DxDesigner / Logical-Physical 管理操作。') self.validate_source(request) - def validate_source(self, request): + def validate_source(self, request, *, probe_files=True): if request.operation not in ('add', 'update'): return if request.source is None: raise ValueError('请选择完整来源工程。') - source = Path(request.source).resolve(strict=True) - if not source.is_file() or source.suffix.casefold() != '.prj': + source = Path(request.source) + if probe_files: + source = source.resolve(strict=True) + if source.suffix.casefold() != '.prj' or probe_files and not source.is_file(): raise ValueError('请选择完整来源工程的 PRJ 文件。') if source.stem.casefold() != request.name.casefold(): raise ValueError(f'SOURCE_NAME_MISMATCH: 来源工程名 {source.stem} 与目标 {request.name} 不一致;' diff --git a/src/cbb_refresh_verify/ui/management_dialog.py b/src/cbb_refresh_verify/ui/management_dialog.py index f129a27..0f0a6b0 100644 --- a/src/cbb_refresh_verify/ui/management_dialog.py +++ b/src/cbb_refresh_verify/ui/management_dialog.py @@ -158,7 +158,7 @@ class ManagementDialog(QDialog): raise ValueError('请先选择来源工程。') if hasattr(self.adapter, 'validate_source'): for request in requests: - self.adapter.validate_source(request) + self.adapter.validate_source(request, probe_files=False) # 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('批次包含重复目标名称。') @@ -177,6 +177,7 @@ class ManagementDialog(QDialog): QMessageBox.Yes) if answer != QMessageBox.Yes: return + requests = [replace(request, check_previous_release=True) for request in requests] if self.admit is not None and not self.admit(tuple(requests)): self.status_label.setText('相同任务已提交,未重复执行。') return diff --git a/tests/test_issue15_confirmed_management_retry.py b/tests/test_issue15_confirmed_management_retry.py new file mode 100644 index 0000000..e716295 --- /dev/null +++ b/tests/test_issue15_confirmed_management_retry.py @@ -0,0 +1,68 @@ +"""A fresh confirmed operation may recover data; historical requests never replay.""" +from dataclasses import replace +import json +from pathlib import Path + +import pytest + +from test_management import setup, execute + + +@pytest.mark.parametrize('proof_case', ['fresh','none','wrong_library','wrong_block','cached','live_writer']) +def test_confirmed_retry_requires_fresh_exact_resource_proof(setup,monkeypatch,proof_case): + request,adapter,source=setup + old=request.evidence_dir/'old';old.mkdir(parents=True) + record={'operation':'update','library':str(request.library),'name':'Block','stage':'complete', + 'status':'RECOVERY_REQUIRED','safe_to_continue':True,'history':[{'stage':'native_add'}]} + path=old/'checkpoint.json';path.write_text(json.dumps(record));before=path.read_bytes() + observed=[] + def proof(library,evidence,*,block_name,required,**kw): + observed.append((library,evidence,block_name,required)) + if proof_case=='live_writer':raise RuntimeError('NATIVE_WRITER_ACTIVE') + if proof_case=='none':return None + target=library if proof_case!='wrong_library' else library.with_name('other.lmc') + block=block_name if proof_case!='wrong_block' else 'Other' + receipt=(old if proof_case=='cached' else evidence/'fresh')/'release.json' + receipt.parent.mkdir(parents=True,exist_ok=True) + result={'status':'RELEASE_CONFIRMED','lease_state':'RELEASED','library':str(target), + 'proof_scope':'BLOCK','proof_block_names':[block], + 'resource_scope':{'scope_state':'OBSERVED','library':str(target),'block_names':[block]}, + 'evidence_path':str(receipt)} + receipt.write_text(json.dumps(result));return result + monkeypatch.setattr('cbb_refresh_verify.library_lock.recheck_previous_release',proof) + result=execute(replace(request,operation='update',source=source,auto_verify=False,check_previous_release=True),adapter) + assert observed and observed[0][2:]==('Block',True) + assert path.read_bytes()==before + if proof_case=='fresh': + assert result.status=='UPLOADED' and result.safe_to_continue + assert adapter.calls[0]=='remove' and adapter.calls[1][0]=='add' + else: + assert result.status=='BLOCKED' and adapter.calls==[] + + +def test_old_request_without_current_confirmation_remains_blocked(setup,monkeypatch): + request,adapter,source=setup + old=request.evidence_dir/'old';old.mkdir(parents=True) + (old/'checkpoint.json').write_text(json.dumps({'library':str(request.library),'name':'Block', + 'stage':'complete','status':'RECOVERY_REQUIRED','safe_to_continue':True,'history':[{'stage':'native_add'}]})) + result=execute(replace(request,operation='update',source=source,auto_verify=False),adapter) + assert result.status=='BLOCKED' and adapter.calls==[] + + +def test_ui_adds_fresh_recheck_only_after_current_yes(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 + from cbb_refresh_verify.ui import timed_prompt + request=ManagementRequest('remove',tmp_path/'lib.lmc','Block') + captured=[] + def runner(requests,**kw): + captured.extend(requests) + return [ManagementResult('remove',request.library,'Block','Logical-Physical',None,False,'complete','REMOVED',True)] + dialog=ManagementDialog([request],runner=runner);qtbot.addWidget(dialog);dialog.show() + answer=[QMessageBox.No] + monkeypatch.setattr(timed_prompt,'question',lambda *a,**k:answer[0]) + dialog._execute();assert not captured and not dialog.requests()[0].check_previous_release + answer[0]=QMessageBox.Yes;dialog._execute() + qtbot.waitUntil(lambda:not dialog.busy) + assert len(captured)==1 and captured[0].check_previous_release diff --git a/tests/test_issue15_native_source_name.py b/tests/test_issue15_native_source_name.py index b899741..8f310fb 100644 --- a/tests/test_issue15_native_source_name.py +++ b/tests/test_issue15_native_source_name.py @@ -47,3 +47,23 @@ def test_management_preview_reports_mismatch_and_allows_rechoose(qtbot,tmp_path, dialog.table.item(0,2).setText(str(right)) dialog.execute_button.click() assert len(questions)==1 and not dialog.busy + + +def test_source_name_preview_does_not_resolve_files_on_gui_thread(qtbot,tmp_path,monkeypatch): + from pathlib import Path + from PySide6.QtWidgets import QMessageBox + from cbb_refresh_verify.ui.management_dialog import ManagementDialog + from cbb_refresh_verify.ui import timed_prompt + source=project(tmp_path/'source','Block') + request=ManagementRequest('update',tmp_path/'library.lmc','Block',source=source) + dialog=ManagementDialog([request],adapter=NativeManagementAdapter()) + qtbot.addWidget(dialog);dialog.show() + original=Path.resolve + def resolve(path,*args,**kw): + assert path!=source,'GUI preview touched potentially stalled source metadata' + return original(path,*args,**kw) + monkeypatch.setattr(Path,'resolve',resolve) + questions=[] + monkeypatch.setattr(timed_prompt,'question',lambda *a,**k:questions.append(a) or QMessageBox.No) + dialog._execute() + assert len(questions)==1 diff --git a/tests/test_management_retry_blockers.py b/tests/test_management_retry_blockers.py index d18f6d9..c78799b 100644 --- a/tests/test_management_retry_blockers.py +++ b/tests/test_management_retry_blockers.py @@ -542,7 +542,7 @@ def test_add_source_missing_central_library_fails_before_capture_without_retaini 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) + result = execute(replace(request, operation='add', name=source.stem, 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()