oep-client-python 0.0.41__py3-none-any.whl → 0.0.42__py3-none-any.whl

oep_client/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.0.41"
+__version__ = "0.0.42"

oep_client/{conformance.py → conformance/__init__.py}

@@ -18,7 +18,7 @@ import struct
 import subprocess
 import time
 
-from .hardware import equipment_lock, tomllib
+from ..hardware import equipment_lock, tomllib
 
 
 CORE_CASES = (
@@ -112,35 +112,35 @@ def ops(value):
 
 
 
-CHECKER_SOURCES = ('conformance.py', 'conformance_core_smoke.py', 'conformance_session_smoke.py', 'conformance_interface_smoke.py', 'conformance_oep_smoke.py', 'conformance_execution_order.py', 'conformance_execution_order_sample.py', 'conformance_host_notifications.py', 'conformance_host_notifications_sample.py',
-                   'conformance_host_values.py', 'conformance_host_values_sample.py',
-                   'conformance_tlv_requests.py',
-                   'conformance_host_requests.py', 'conformance_host_request_sample.py',
-                   'conformance_link_transfers.py', 'conformance_link_transfer_sample.py',
-                   'conformance_link_routes.py', 'conformance_link_routes_sample.py',
-                   'conformance_port_speed.py', 'conformance_port_speed_sample.py', 'conformance_port_speed_lifecycle.py', 'conformance_port_speed_execution.py', 'conformance_port_speed_execution_sample.py',
-                   'conformance_host_tlv.py', 'conformance_host_tlv_sample.py', 'conformance_host_core.py', 'conformance_core_fixed_fields.py', 'conformance_probe_input.py', 'conformance_probe_input_sample.py', 'conformance_refusal_order.py', 'conformance_refusal_order_sample.py', 'conformance_restart.py', 'conformance_restart_sample.py', 'conformance_host_wait.py', 'conformance_host_wait_sample.py', 'conformance_host_deadline.py', 'conformance_host_deadline_sample.py', 'conformance_host_resend.py', 'conformance_host_resend_sample.py', 'conformance_tcp_recovery.py', 'conformance_tcp_recovery_sample.py', 'conformance_host_core_sample.py', 'conformance_allocator.py', 'conformance_allocator_sample.py', 'conformance_discovery.py', 'conformance_clock.py', 'conformance_clock_sample.py',
-                   'conformance_notification_sequence.py', 'conformance_notification_sequence_sample.py', 'conformance_notification_retention.py', 'conformance_notification_retention_sample.py', 'conformance_serial.py', 'conformance_tcp.py',
-                   'conformance_tcp_peers.py', 'conformance_usb.py', 'conformance_usb_cases.py',
-                   'pytest_conformance.py', 'conformance_resources.py', 'conformance_resource_sample.py',
-                   'conformance_subscriptions.py', 'conformance_subscription_sample.py',
-                   'conformance_data.py', 'conformance_data_sample.py',
-                   'conformance_routes.py', 'conformance_route_sample.py',
-                   'conformance_pipeline.py', 'conformance_pipeline_sample.py',
-                   'conformance_replay_pressure.py', 'conformance_lease.py', 'conformance_lease_sample.py',
-                   'conformance_retention.py', 'conformance_retention_sample.py',
-                   'conformance_retention_lifecycle.py', 'conformance_retention_lifecycle_sample.py',
-                   'conformance_corr.py', 'conformance_recovery.py', 'conformance_recovery_sample.py',
-                   'conformance_recovery_races.py', 'conformance_recovery_race_sample.py',
-                   'conformance_session_loss.py', 'conformance_session_loss_sample.py',
-                   'conformance_exhausted.py', 'conformance_exhausted_sample.py', 'conformance_interfaces.py',
-                   'conformance_stream.py', 'conformance_stream_sample.py',
-                   'conformance_outcomes.py', 'conformance_outcome_sample.py',
-                   'conformance_dependencies.py', 'conformance_dependency_sample.py', 'conformance_oep_declarations.py', 'conformance_attach.py', 'conformance_attach_sample.py', 'conformance_scan.py', 'conformance_scan_sample.py', 'conformance_mailbox.py', 'conformance_mailbox_sample.py', 'conformance_dmseq.py', 'conformance_dmseq_sample.py', 'conformance_dmseq_target.py', 'conformance_dmseq_target_sample.py', 'conformance_debug.py', 'conformance_debug_sample.py', 'conformance_blocks.py', 'conformance_block_sample.py', 'conformance_step.py', 'conformance_step_sample.py', 'conformance_reset.py', 'conformance_reset_sample.py', 'conformance_run.py', 'conformance_run_sample.py', 'conformance_wire_options.py', 'conformance_wire_options_sample.py', 'conformance_scan_options.py', 'conformance_scan_options_sample.py', 'conformance_retry.py', 'conformance_retry_sample.py', 'conformance_cut.py', 'conformance_cut_sample.py', 'conformance_writer_lease.py', 'conformance_writer_lease_sample.py', 'conformance_response_race.py', 'conformance_response_race_sample.py', 'conformance_registered_ops.py', 'conformance_selected_metadata.py','conformance_fixture_metadata.py','conformance_capture_metadata.py','conformance_gpio.py','conformance_gpio_sample.py','conformance_gpio_lifecycle.py','conformance_gpio_lifecycle_sample.py','conformance_uart.py','conformance_uart_sample.py','conformance_uart_stream.py','conformance_uart_stream_sample.py','conformance_i2c.py','conformance_i2c_sample.py','conformance_spi.py','conformance_spi_sample.py','conformance_logic.py','conformance_logic_sample.py','conformance_analog_payload.py','conformance_analog.py','conformance_analog_sample.py','conformance_capture_group.py','conformance_capture_group_sample.py','conformance_capture_group_geometry.py','conformance_capture_timeline.py','conformance_capture_timeline_sample.py','conformance_capture_timeline_lifecycle.py', 'conformance_capture_serial.py', 'conformance_capture_serial_sample.py','conformance_arm_adi.py','conformance_arm_adi_sample.py','conformance_arm_adi_blocks.py')
+CHECKER_SOURCES = ('__init__.py', 'core_smoke.py', 'session_smoke.py', 'interface_smoke.py', 'oep_smoke.py', 'execution_order.py', 'execution_order_sample.py', 'host_notifications.py', 'host_notifications_sample.py',
+                   'host_values.py', 'host_values_sample.py',
+                   'tlv_requests.py',
+                   'host_requests.py', 'host_request_sample.py',
+                   'link_transfers.py', 'link_transfer_sample.py',
+                   'link_routes.py', 'link_routes_sample.py',
+                   'port_speed.py', 'port_speed_sample.py', 'port_speed_lifecycle.py', 'port_speed_execution.py', 'port_speed_execution_sample.py',
+                   'host_tlv.py', 'host_tlv_sample.py', 'host_core.py', 'core_fixed_fields.py', 'probe_input.py', 'probe_input_sample.py', 'refusal_order.py', 'refusal_order_sample.py', 'restart.py', 'restart_sample.py', 'host_wait.py', 'host_wait_sample.py', 'host_deadline.py', 'host_deadline_sample.py', 'host_resend.py', 'host_resend_sample.py', 'tcp_recovery.py', 'tcp_recovery_sample.py', 'host_core_sample.py', 'allocator.py', 'allocator_sample.py', 'discovery.py', 'clock.py', 'clock_sample.py',
+                   'notification_sequence.py', 'notification_sequence_sample.py', 'notification_retention.py', 'notification_retention_sample.py', 'serial.py', 'tcp.py',
+                   'tcp_peers.py', 'usb.py', 'usb_cases.py',
+                   '../pytest_conformance.py', 'resources.py', 'resource_sample.py',
+                   'subscriptions.py', 'subscription_sample.py',
+                   'data.py', 'data_sample.py',
+                   'routes.py', 'route_sample.py',
+                   'pipeline.py', 'pipeline_sample.py',
+                   'replay_pressure.py', 'lease.py', 'lease_sample.py',
+                   'retention.py', 'retention_sample.py',
+                   'retention_lifecycle.py', 'retention_lifecycle_sample.py',
+                   'corr.py', 'recovery.py', 'recovery_sample.py',
+                   'recovery_races.py', 'recovery_race_sample.py',
+                   'session_loss.py', 'session_loss_sample.py',
+                   'exhausted.py', 'exhausted_sample.py', 'interfaces.py',
+                   'stream.py', 'stream_sample.py',
+                   'outcomes.py', 'outcome_sample.py',
+                   'dependencies.py', 'dependency_sample.py', 'oep_declarations.py', 'attach.py', 'attach_sample.py', 'scan.py', 'scan_sample.py', 'mailbox.py', 'mailbox_sample.py', 'dmseq.py', 'dmseq_sample.py', 'dmseq_target.py', 'dmseq_target_sample.py', 'debug.py', 'debug_sample.py', 'blocks.py', 'block_sample.py', 'step.py', 'step_sample.py', 'reset.py', 'reset_sample.py', 'run.py', 'run_sample.py', 'wire_options.py', 'wire_options_sample.py', 'scan_options.py', 'scan_options_sample.py', 'retry.py', 'retry_sample.py', 'cut.py', 'cut_sample.py', 'writer_lease.py', 'writer_lease_sample.py', 'response_race.py', 'response_race_sample.py', 'registered_ops.py', 'selected_metadata.py','fixture_metadata.py','capture_metadata.py','gpio.py','gpio_sample.py','gpio_lifecycle.py','gpio_lifecycle_sample.py','uart.py','uart_sample.py','uart_stream.py','uart_stream_sample.py','i2c.py','i2c_sample.py','spi.py','spi_sample.py','logic.py','logic_sample.py','analog_payload.py','analog.py','analog_sample.py','capture_group.py','capture_group_sample.py','capture_group_geometry.py','capture_timeline.py','capture_timeline_sample.py','capture_timeline_lifecycle.py', 'capture_serial.py', 'capture_serial_sample.py','arm_adi.py','arm_adi_sample.py','arm_adi_blocks.py')
 
 
 def checker_sources_sha256():
-    return {name: hashlib.sha256(Path(__file__).with_name(name).read_bytes()).hexdigest()
+    return {name: hashlib.sha256((Path(__file__).parent / name).read_bytes()).hexdigest()
             for name in CHECKER_SOURCES}
 
 
@@ -781,13 +781,16 @@ class Checks:
         tail = b'\x01' + struct.pack('<H', len(owner)) + owner
         if not self.owner_displayed(tail):
             raise NotApplicable('owner display not implemented (core §6.4: optional); a non-critical owner is ignored')
-        tail += b'\x81\x06\x00second'  # same tag, critical flag, first occurrence wins
+        twice = tail + b'\x81\x06\x00second'  # the same tag again (critical bit set): malformed (core §2.3)
+        self.corr = 0
+        self.rejected(self.request(self.core['open'], struct.pack('<IB', 3000, 0) + twice,
+                                   session=secrets.randbelow(0xffffffff) + 1), 'malformed')
         with self.holding(tail=tail) as sid:
             def observed_owner():
                 p = self.success(self.request(self.core['lock_state']))
                 require(len(p) >= 5 and p[0] == 1, 'owner lock state')
                 values = dict(reversed(tlvs(p[5:])))
-                require(values.get(1) == owner, 'owner changed or first duplicate not used')
+                require(values.get(1) == owner, 'owner changed')
             observed_owner()
             self.success(self.request(self.core['open'], struct.pack('<IB', 3000, 0) + b'\x01\x06\x00second', session=sid))
             observed_owner()
@@ -838,7 +841,7 @@ class Checks:
             tlvs(self.success(self.request(self.core['keepalive'], session=new)))
 
     def serial_case(self, kind):
-        from .conformance_serial import frame, WireError
+        from .serial import frame, WireError
         with self.holding(60000):
             req = self.request(self.core['clock'])
             good = frame(req)
@@ -897,8 +900,8 @@ class Checks:
                 record['serial_wire'] = self.wire.last_exchange
 
     def tcp_case(self, kind):
-        from .conformance_tcp import frame
-        from .conformance_serial import WireError
+        from .tcp import frame
+        from .serial import WireError
         req = self.request(self.core['clock'])  # no session or target mutations
         good = frame(req)
         pause, close = 0, False
@@ -984,12 +987,12 @@ class Checks:
             for name, kind in RECONNECT_CASES:
                 self.check(name, 'transports §3; core §5.1/6.1/9', lambda kind=kind: self.reconnect(kind))
         if self.usb_wire is not None:
-            from .conformance_usb_cases import USB_CASES, HID_CASES, run
+            from .usb_cases import USB_CASES, HID_CASES, run
             cases = USB_CASES + (HID_CASES if self.usb_wire.kind == 'hid' else ())
             for name, kind in cases:
                 self.check(name, 'transports §1/2/3; core §2.4', lambda kind=kind: run(self, kind))
         if self.tcp_peer_open is not None:
-            from .conformance_tcp_peers import Peers
+            from .tcp_peers import Peers
             peers = Peers(self)
             for name, kind in TCP_PEER_CASES:
                 self.check(name, 'transports §1/3; core §4.2/4.4/6', lambda kind=kind: getattr(peers, kind)())
@@ -1036,7 +1039,7 @@ def main(argv=None):
         require_reviewed_contract(registry, spec)
     except Violation as exc:
         parser.error(str(exc))
-    from . import __version__, link
+    from .. import __version__, link
     report = {'status': 'failed', 'spec': spec, 'client_version': __version__,
               'checker_sha256': hashlib.sha256(Path(__file__).read_bytes()).hexdigest(),
               'checker_sources_sha256': checker_sources_sha256(),
@@ -1051,7 +1054,7 @@ def main(argv=None):
                     if args.framing == 'serial':
                         if args.address.startswith(('usb:', 'tcp:', 'tcp://')):
                             raise ValueError('serial framing needs an explicit serial port')
-                        from .conformance_serial import SerialWire
+                        from .serial import SerialWire
                         stream = link.open_serial(args.address)
                         try:
                             wire = SerialWire(stream)
@@ -1067,7 +1070,7 @@ def main(argv=None):
                             link._exclusive_off(wire.stream)
                             wire.stream.close()
                     elif args.framing == 'tcp':
-                        from .conformance_tcp import TcpWire
+                        from .tcp import TcpWire
                         wire = TcpWire.open(args.address)
                         try:
                             checks = Checks(wire.send, registry, args.unit)

oep_client/{conformance_allocator.py → conformance/allocator.py}

@@ -1,7 +1,7 @@
 """Core resource ID exhaustion, session retention and reboot boundary checks."""
 import struct
-from .conformance import require,tlvs
-from .conformance_resources import ResourceChecks
+from . import require,tlvs
+from .resources import ResourceChecks
 
 
 class AllocatorChecks(ResourceChecks):

oep_client/{virtual_allocator_model.py → conformance/allocator_model.py}

@@ -1,7 +1,7 @@
 """Logical resource allocator boundary fixture; seed is not a history of real allocations."""
 import copy
-from .virtual_core import Core
-from .virtual_resource_model import ResourceModel, Resources
+from ..virtual_core import Core
+from .resource_model import ResourceModel, Resources
 
 
 class U32Resources(Resources):

oep_client/{conformance_allocator_sample.py → conformance/allocator_sample.py}

@@ -1,6 +1,6 @@
 """Explicit allocator boundary controls; no probe-model imports."""
-from .conformance_resource_sample import SampleResourceAdapter
-from .conformance_route_sample import SampleRouteAdapter
+from .resource_sample import SampleResourceAdapter
+from .route_sample import SampleRouteAdapter
 
 
 class SampleAllocatorAdapter(SampleResourceAdapter,SampleRouteAdapter):

oep_client/{conformance_analog.py → conformance/analog.py}

@@ -1,9 +1,9 @@
 """Selected-SPEC ADC operations checked independently of model and Host decoder."""
 import struct
-from .conformance import require, tlvs
-from .conformance_logic import LogicChecks
-from .conformance_analog_payload import AnalogPayloadChecks
-from .conformance_registered_ops import RegisteredOpsChecks
+from . import require, tlvs
+from .logic import LogicChecks
+from .analog_payload import AnalogPayloadChecks
+from .registered_ops import RegisteredOpsChecks
 
 
 class AnalogChecks(LogicChecks):

oep_client/{virtual_analog_model.py → conformance/analog_model.py}

@@ -6,11 +6,11 @@ legacy virtual bench sampler or Host capture decoder.
 import struct
 
 from fractions import Fraction
-from .virtual_logic_model import Logic, LogicModel
-from .virtual_core import Core, Reject, tlv
-from . import registry as _reg
-from .catalog import pack_ops
-from .virtual_names import R, DC, cause
+from .logic_model import Logic, LogicModel
+from ..virtual_core import Core, Reject, tlv
+from .. import registry as _reg
+from ..catalog import pack_ops
+from ..virtual_names import R, DC, cause
 
 # oep.fixture.analog's numbers by name (capture §3)
 _A = _reg.FIXTURE_ANALOG
@@ -77,7 +77,7 @@ class Analog(Logic):
             if not known:                                  # every copy of an unknown tag: critical -> unsupported (core §2.3)
                 if raw&128:raise Reject(R['unsupported'],bytes((raw,)))
                 continue
-            if key in seen and key!=C['frontend']:later.append((key,raw,value));continue   # a later copy: checked in settings (core §2.3)
+            if key in seen and key!=C['frontend']:raise Reject(R['malformed'])   # a non-repeating tag twice (core §2.3); frontend repeats
             seen.add(key)
             if key==C['frontend']:frontends.append((raw,value))
             else:got[key]=(raw,value)

oep_client/{conformance_analog_payload.py → conformance/analog_payload.py}

@@ -6,7 +6,7 @@ checks payload contracts, not execution, session ownership or physical accuracy.
 import re
 import struct
 from fractions import Fraction
-from .conformance import require, tlvs
+from . import require, tlvs
 
 
 class AnalogPayloadChecks:

oep_client/{conformance_analog_sample.py → conformance/analog_sample.py}

@@ -1,5 +1,5 @@
 """Explicit ADC sample adapter; does not import any probe implementation."""
-from .conformance_route_sample import SampleRouteAdapter
+from .route_sample import SampleRouteAdapter
 
 
 class SampleAnalogAdapter(SampleRouteAdapter):

oep_client/{conformance_arm_adi.py → conformance/arm_adi.py}

@@ -1,7 +1,7 @@
 """Independent ARM-ADI transfer checks and basic logical bus-block checks (debug §6)."""
 import struct
-from .conformance import require, ops, tlvs
-from .conformance_attach import AttachChecks
+from . import require, ops, tlvs
+from .attach import AttachChecks
 
 
 class ArmAdiChecks(AttachChecks):

oep_client/{conformance_arm_adi_blocks.py → conformance/arm_adi_blocks.py}

@@ -1,7 +1,7 @@
 """Logical MEM-AP block packet, wrap and progress checks; retains base ARM checks."""
 import struct
-from .conformance import require, tlvs
-from .conformance_arm_adi import ArmAdiChecks
+from . import require, tlvs
+from .arm_adi import ArmAdiChecks
 
 
 class ArmAdiBlockChecks(ArmAdiChecks):

oep_client/{virtual_arm_adi_model.py → conformance/arm_adi_model.py}

@@ -1,8 +1,8 @@
 """Logical ARM raw transfers and abstract bus blocks; no SWD electrical implementation."""
 import copy
 import struct
-from .virtual_attach_model import Attachments, AttachModel
-from .virtual_core import Core, Completed, Reject, tlv
+from .attach_model import Attachments, AttachModel
+from ..virtual_core import Core, Completed, Reject, tlv
 
 
 def fixed_transfer(data):

oep_client/{conformance_arm_adi_sample.py → conformance/arm_adi_sample.py}

@@ -1,5 +1,5 @@
 """Explicit ARM logical controls; no model imports or implicit device discovery."""
-from .conformance_attach_sample import SampleAttachAdapter
+from .attach_sample import SampleAttachAdapter
 
 
 class SampleArmAdiAdapter(SampleAttachAdapter):

oep_client/{conformance_attach.py → conformance/attach.py}

@@ -1,7 +1,7 @@
 """SPEC-driven standard attach admission and console open checks."""
 import struct
-from .conformance import require, ops, tlvs
-from .conformance_registered_ops import refusal_carries
+from . import require, ops, tlvs
+from .registered_ops import refusal_carries
 
 
 class AttachChecks:
@@ -96,9 +96,8 @@ class AttachChecks:
                 for tail in (b'\0\0\0',bytes((reset,)),bytes((self.unknown|128,4,0))+b'x',self.reset_tlv()+self.tlv(reset,b'x')):
                     self.refused(self.attach_request(sid,extra=tail),'malformed')
             elif kind=='UNMARKED':self.attach(sid,extra=self.reset_tlv(marked=False)+self.tlv(self.unknown,b'x'))
-            elif kind=='FIRST-WINS':
-                self.attach(sid,speed=1500,extra=self.reset_tlv(hold=10)+self.reset_tlv(hold=20))
-                require(self.a.state()['touch'][-1][2]==10,'a later copy of reset was used')
+            elif kind=='TWICE':                            # a non-repeating tag twice: malformed (core §2.3)
+                self.refused(self.attach_request(sid,speed=1500,extra=self.reset_tlv(hold=10)+self.reset_tlv(hold=20)),'malformed')
             elif kind=='BUSY':
                 self.attach(sid);self.refused(self.attach_request(sid,pair=(0,1)),'unavailable',cause='pin_in_use')   # never joined
                 self.refused(self.attach_request(sid,fn=2,pair=(0,65535)),'unavailable',cause='pin_in_use')
@@ -186,7 +185,7 @@ class AttachChecks:
             self.c.observed['attach_fixture']={'selection':self.a.selection,'pairs':self.a.pairs,'mechanisms':self.a.mechanisms,'scope':'logical-model','reference':self.a.reference}
         self.c.check('OEP-ATTACH-CONTEXT','debug §1/3/5; console §1',context)
         if self.c.results[-1]['status']!='passed':self.c.abort=True
-        cases=[('WIRE-'+kind,lambda kind=kind:self.wire_case(kind)) for kind in ('SHORT','ZERO-SPEED','WIDTH','LOW-SPEED','PINS','METHOD','TLV','MALFORMED','UNMARKED','FIRST-WINS','BUSY','CAPACITY','FAILED','REPLAY')]
+        cases=[('WIRE-'+kind,lambda kind=kind:self.wire_case(kind)) for kind in ('SHORT','ZERO-SPEED','WIDTH','LOW-SPEED','PINS','METHOD','TLV','MALFORMED','UNMARKED','TWICE','BUSY','CAPACITY','FAILED','REPLAY')]
         cases += [('CONSOLE-'+kind,lambda kind=kind:self.console_case(kind)) for kind in ('UNSUPPORTED','RESOURCE','DUPLICATE','MALFORMED','INDEPENDENT','RECREATE-REPLAY')]+[('LOCKS',self.locks)]
         for name,case in cases:
             first=len(self.a.trace);self.c.check('OEP-ATTACH-'+name,'debug §1/3/5; console §1/2/3; core §2.3/5.2',case);self.c.results[-1]['adapter_trace']=self.a.trace[first:]

oep_client/{virtual_attach_model.py → conformance/attach_model.py}

@@ -1,11 +1,11 @@
 """Logical standard attach/console fixture; no electrical target operations."""
 import struct
-from .virtual_core import Core, Completed, Reject, tlv
-from .virtual_dependency_model import Dependencies, DependencyModel
-from .virtual_stream_model import Stream
-from . import registry as _reg
-from .catalog import pack_ops
-from .virtual_names import R, DC, cause, extension
+from ..virtual_core import Core, Completed, Reject, tlv
+from .dependency_model import Dependencies, DependencyModel
+from .stream_model import Stream
+from .. import registry as _reg
+from ..catalog import pack_ops
+from ..virtual_names import R, DC, cause, extension
 
 # the wire family's and the console's numbers by name (debug §1-§3, console §1-§3)
 WOP, WT, WE = _reg.WIRE_RVSWD.op, _reg.WIRE_RVSWD.tlv, _reg.WIRE_RVSWD.enum
@@ -54,7 +54,7 @@ class Attachments(Dependencies):
             if tag not in known:
                 if raw&128:raise Reject(R['unsupported'],bytes((raw,)))
                 continue
-            if size!=known[tag]:raise Reject(R['malformed'])                 # every copy is checked; the first is used
+            if size!=known[tag] or tag in result:raise Reject(R['malformed'])   # another length, or the tag twice (core §2.3)
             channel,hold=struct.unpack('<HH',value)
             # not the reset line, or a hold past max_op_ms (debug §3, core §7.5): the tag as received, every copy
             if channel!=self.reset_channel or hold>self.ep.max_op_ms:raise Reject(R['unsupported'],bytes((raw,)))

oep_client/{conformance_attach_sample.py → conformance/attach_sample.py}

@@ -1,5 +1,5 @@
 """Explicit logical standard attach/console fixture controls."""
-from .conformance_route_sample import SampleRouteAdapter
+from .route_sample import SampleRouteAdapter
 
 
 class SampleAttachAdapter(SampleRouteAdapter):

oep_client/{virtual_block_model.py → conformance/block_model.py}

@@ -1,8 +1,8 @@
 """Logical optional block fixture with explicit bus and scratch restoration."""
 import copy
 import struct
-from .virtual_debug_model import Debug, DebugModel, fixed_dmi
-from .virtual_core import Core, Completed, Reject, tlv
+from .debug_model import Debug, DebugModel, fixed_dmi
+from ..virtual_core import Core, Completed, Reject, tlv
 
 
 HARTSEL=(0x3ff<<6)|(0x3ff<<16)

oep_client/{conformance_block_sample.py → conformance/block_sample.py}

@@ -1,5 +1,5 @@
 """Explicit block memory and scratch-register fixture controls."""
-from .conformance_debug_sample import SampleDebugAdapter
+from .debug_sample import SampleDebugAdapter
 
 
 class SampleBlockAdapter(SampleDebugAdapter):

oep_client/{conformance_blocks.py → conformance/blocks.py}

@@ -1,8 +1,8 @@
 """Independent optional riscv-dm block admission, progress and restoration checks."""
 import struct
-from .conformance import require, tlvs, ops
-from .conformance_debug import DebugChecks
-from .conformance_dmseq import target_frame
+from . import require, tlvs, ops
+from .debug import DebugChecks
+from .dmseq import target_frame
 
 
 HARTSEL=(0x3ff<<6)|(0x3ff<<16)

oep_client/{conformance_capture_group.py → conformance/capture_group.py}

@@ -1,9 +1,9 @@
 """Independent selected-SPEC group wire/lifecycle checker for paired sample fixtures."""
 import secrets
 import struct
-from .conformance import require, tlvs
-from .conformance_registered_ops import RegisteredOpsChecks
-from .conformance_analog_payload import AnalogPayloadChecks
+from . import require, tlvs
+from .registered_ops import RegisteredOpsChecks
+from .analog_payload import AnalogPayloadChecks
 
 NO_TIME=(1<<64)-1
 LAST=0xffffffff

oep_client/{conformance_capture_group_geometry.py → conformance/capture_group_geometry.py}

@@ -5,7 +5,7 @@ caller's controlled fixture, not a guarantee inferred from uncertainty metadata.
 """
 import struct
 from fractions import Fraction
-from .conformance import require, tlvs
+from . import require, tlvs
 
 NO_TIME=(1<<64)-1
 NONE=(1<<32)-1

oep_client/{virtual_capture_group_geometry_model.py → conformance/capture_group_geometry_model.py}

@@ -5,7 +5,7 @@ does not import this module or use its expected records.
 """
 import struct
 
-from . import registry as _reg
+from .. import registry as _reg
 
 _A = _reg.FIXTURE_ANALOG.tlv["configure_answer"]           # the capture family's answer tags (capture §3.3)
 

oep_client/{virtual_capture_group_model.py → conformance/capture_group_model.py}

@@ -8,13 +8,13 @@ fn 4 is the checked group and fn 5 a peer group that only holds tracks; fns
 import copy
 import struct
 from fractions import Fraction
-from .virtual_gpio_model import Gpio
-from .virtual_logic_model import Logic, LogicModel
-from .virtual_analog_model import Analog, refuse_output_idle
-from .virtual_core import Core, Reject, tlv
-from . import registry as _reg
-from .catalog import pack_ops
-from .virtual_names import R, DC, cause, UNAVAILABLE_TLV
+from .gpio_model import Gpio
+from .logic_model import Logic, LogicModel
+from .analog_model import Analog, refuse_output_idle
+from ..virtual_core import Core, Reject, tlv
+from .. import registry as _reg
+from ..catalog import pack_ops
+from ..virtual_names import R, DC, cause, UNAVAILABLE_TLV
 
 # the capture family's numbers by name (capture §2-§4)
 _L, _A, _G = _reg.FIXTURE_LOGIC, _reg.FIXTURE_ANALOG, _reg.FIXTURE_CAPTURE_GROUP

oep_client/{conformance_capture_group_sample.py → conformance/capture_group_sample.py}

@@ -1,5 +1,5 @@
 """Explicit paired-sample group adapter, without implementation imports."""
-from .conformance_route_sample import SampleRouteAdapter
+from .route_sample import SampleRouteAdapter
 
 
 class SampleCaptureGroupAdapter(SampleRouteAdapter):

oep_client/{conformance_capture_metadata.py → conformance/capture_metadata.py}

@@ -1,7 +1,7 @@
 """Read-only selected capture describe contracts, not op behavior."""
 import struct
-from .conformance import require
-from .conformance_registered_ops import RegisteredOpsChecks
+from . import require
+from .registered_ops import RegisteredOpsChecks
 
 
 class CaptureMetadataChecks:

oep_client/{virtual_capture_metadata_model.py → conformance/capture_metadata_model.py}

@@ -1,7 +1,7 @@
 """Independent capture describe fixture; no advertised op implementation."""
 import struct
-from .virtual_registered_ops_model import RegisteredOps, RegisteredOpsModel
-from .virtual_core import Core, tlv
+from .registered_ops_model import RegisteredOps, RegisteredOpsModel
+from ..virtual_core import Core, tlv
 
 
 class CaptureMetadata(RegisteredOps):

oep_client/{conformance_capture_serial.py → conformance/capture_serial.py}

@@ -2,8 +2,8 @@
 import hashlib
 from pathlib import Path
 import struct
-from .conformance import require, tlvs
-from .conformance_registered_ops import refusal_carries
+from . import require, tlvs
+from .registered_ops import refusal_carries
 
 
 def answered(reply,fixed):
@@ -15,7 +15,7 @@ def answered(reply,fixed):
 def refused_stale(reply):
     """rejected unavailable carrying cause 6, other TLVs in any order around it (core §4.3)."""
     return reply[3:5]==b'\0\4' and refusal_carries('unavailable',reply[5:],b'\1\1\0\6')
-from .conformance_host_deadline import reviewed_identity as core_identity
+from .host_deadline import reviewed_identity as core_identity
 
 REVIEWED={'interfaces/oep-if-capture.ja.md':'ffd89a6a1abf006aea788a6b47b270e6ac0e6d8190a716f4123c4f499bd3a61e',
           'interfaces/oep-if-common.ja.md':'25fed0b1b8b7f246a8b71d02cea810249803b1c3c1e9c3df466c04f38687f70c'}

oep_client/{conformance_capture_serial_sample.py → conformance/capture_serial_sample.py}

@@ -2,10 +2,10 @@
 import hashlib
 from pathlib import Path
 import struct
-from . import message
-from .virtual_core import tlv
-from .virtual_logic_model import LogicModel
-from .virtual_analog_model import AnalogModel
+from .. import message
+from ..virtual_core import tlv
+from .logic_model import LogicModel
+from .analog_model import AnalogModel
 
 
 class SampleCaptureSerialAdapter:
@@ -58,4 +58,4 @@ class SampleCaptureSerialAdapter:
     def source_sha256(self):
         root=Path(__file__).parent
         return {n:hashlib.sha256((root/n).read_bytes()).hexdigest() for n in
-                ('virtual_logic_model.py','virtual_analog_model.py','virtual_core.py','virtual_gpio_model.py','message.py')}
+                ('logic_model.py','analog_model.py','../virtual_core.py','gpio_model.py','../message.py')}

oep_client/{conformance_capture_timeline.py → conformance/capture_timeline.py}

@@ -6,8 +6,8 @@ configure answers; the waveform and clock are the documented fixture's.
 """
 import struct
 from fractions import Fraction
-from .conformance import require,tlvs
-from .conformance_registered_ops import RegisteredOpsChecks
+from . import require,tlvs
+from .registered_ops import RegisteredOpsChecks
 
 NO_TIME=(1<<64)-1
 NONE=0xffffffff

oep_client/{conformance_capture_timeline_lifecycle.py → conformance/capture_timeline_lifecycle.py}

@@ -1,8 +1,8 @@
 """Selected-SPEC cross-rate group stop/error/replay, generation exhaustion, start failure, state table and ownership checks."""
 import secrets
 import struct
-from .conformance import require,tlvs
-from .conformance_capture_timeline import CaptureTimelineChecks,NO_TIME,NONE,arrived
+from . import require,tlvs
+from .capture_timeline import CaptureTimelineChecks,NO_TIME,NONE,arrived
 
 LAST=0xffffffff
 

oep_client/{virtual_capture_timeline_model.py → conformance/capture_timeline_model.py}

@@ -8,12 +8,12 @@ import copy
 import struct
 
 from fractions import Fraction
-from .virtual_gpio_model import Gpio, GpioModel
-from .virtual_core import Completed, Core, Reject, tlv
-from .virtual_analog_model import refuse_output_idle
-from . import registry as _reg
-from .catalog import pack_ops
-from .virtual_names import R, DC, cause, UNAVAILABLE_TLV
+from .gpio_model import Gpio, GpioModel
+from ..virtual_core import Completed, Core, Reject, tlv
+from .analog_model import refuse_output_idle
+from .. import registry as _reg
+from ..catalog import pack_ops
+from ..virtual_names import R, DC, cause, UNAVAILABLE_TLV
 
 # the capture family's numbers by name (capture §2-§4; one space for the family, core §2.5)
 _L, _A, _G = _reg.FIXTURE_LOGIC, _reg.FIXTURE_ANALOG, _reg.FIXTURE_CAPTURE_GROUP
@@ -83,7 +83,7 @@ class Track:
             if not known:                                  # every copy of an unknown tag: critical -> unsupported (core §2.3)
                 if raw&128:raise Reject(R['unsupported'],bytes((raw,)))
                 continue
-            if key in seen and key!=C['frontend']:later.append((key,raw,value));continue   # a later copy: checked in settings (core §2.3)
+            if key in seen and key!=C['frontend']:raise Reject(R['malformed'])   # a non-repeating tag twice (core §2.3); frontend repeats
             seen.add(key)
             if key==C['frontend']:frontends.append((raw,value))
             else:got[key]=(raw,value)

oep_client/{conformance_capture_timeline_sample.py → conformance/capture_timeline_sample.py}

@@ -1,5 +1,5 @@
 """Explicit per-track nanosecond scheduler adapter, without implementation imports."""
-from .conformance_route_sample import SampleRouteAdapter
+from .route_sample import SampleRouteAdapter
 
 
 class SampleCaptureTimelineAdapter(SampleRouteAdapter):

oep_client/{conformance_clock.py → conformance/clock.py}

@@ -1,6 +1,6 @@
 """Core clock sampling, SID-zero isolation, replay exceptions and exact u64 checks."""
 import struct
-from .conformance import require,tlvs
+from . import require,tlvs
 
 
 class ClockChecks: