fix: remove leftover merge marker in pack registry

Author: rookiestar28

services/observability/backpressure.py

@@ -40,11 +40,11 @@ class BoundedQueue(Generic[T]):
     def __init__(self, capacity: int) -> None:
         if capacity <= 0:
             raise ValueError("Capacity must be positive")
-        
+
         self._capacity = capacity
         self._deque: Deque[T] = deque(maxlen=capacity)
         self._lock = threading.Lock()
-        
+
         # Metrics
         self._high_watermark = 0
         self._total_enqueued = 0
@@ -64,14 +64,14 @@ def enqueue(self, item: T) -> bool:
                 self._total_dropped += 1
                 self._last_drop_ts = time.time()
                 dropped = True
-            
+
             self._deque.append(item)
             self._total_enqueued += 1
-            
+
             current_size = len(self._deque)
             if current_size > self._high_watermark:
                 self._high_watermark = current_size
-                
+
         return not dropped
 
     def get_all(self) -> List[T]:
@@ -88,7 +88,7 @@ def stats(self) -> QueueStats:
                 high_watermark=self._high_watermark,
                 total_enqueued=self._total_enqueued,
                 total_dropped=self._total_dropped,
-                last_drop_ts=self._last_drop_ts
+                last_drop_ts=self._last_drop_ts,
             )
 
     def clear(self) -> None:

services/packs/pack_registry.py

@@ -3,7 +3,6 @@
 import shutil
 from typing import Dict, List, Optional
 
-<<<<<<< HEAD
 from ..safe_io import resolve_under_root
 from .pack_archive import PackArchive, PackError
 from .pack_types import PackMetadata
@@ -57,9 +56,7 @@ def install_pack(self, zip_path: str, overwrite: bool = False) -> PackMetadata:
             # A malicious pack.json could contain traversal sequences.
             _validate_pack_segment(name, "name")
             _validate_pack_segment(version, "version")
-            target_dir = resolve_under_root(
-                self.packs_dir, os.path.join(name, version)
-            )
+            target_dir = resolve_under_root(self.packs_dir, os.path.join(name, version))
 
             if os.path.exists(target_dir):
                 if not overwrite:
@@ -76,9 +73,7 @@ def install_pack(self, zip_path: str, overwrite: bool = False) -> PackMetadata:
     def uninstall_pack(self, name: str, version: str) -> bool:
         _validate_pack_segment(name, "name")
         _validate_pack_segment(version, "version")
-        target_dir = resolve_under_root(
-            self.packs_dir, os.path.join(name, version)
-        )
+        target_dir = resolve_under_root(self.packs_dir, os.path.join(name, version))
         if os.path.exists(target_dir):
             shutil.rmtree(target_dir)
             # Clean up parent if empty
@@ -118,9 +113,7 @@ def list_packs(self) -> List[PackMetadata]:
     def get_pack_path(self, name: str, version: str) -> Optional[str]:
         _validate_pack_segment(name, "name")
         _validate_pack_segment(version, "version")
-        target_dir = resolve_under_root(
-            self.packs_dir, os.path.join(name, version)
-        )
+        target_dir = resolve_under_root(self.packs_dir, os.path.join(name, version))
         if os.path.exists(target_dir):
             return target_dir
         return None

services/permission_posture.py

@@ -60,24 +60,24 @@ def __init__(self) -> None:
     def evaluate(self) -> List[PermissionResult]:
         """Run all permission checks."""
         results = []
-        
+
         # 1. State Directory
         results.append(self._check_state_dir())
 
         # 2. Secrets File
         results.append(self._check_secrets_file())
-        
+
         return results
 
     def _check_state_dir(self) -> PermissionResult:
         """Check state directory permissions."""
         path = self.state_dir
         if not path.exists():
-             return PermissionResult(
+            return PermissionResult(
                 resource="state_dir",
                 severity=PermissionSeverity.SKIP,
                 message="State directory does not exist",
-                code="perm.state_dir.missing"
+                code="perm.state_dir.missing",
             )
 
         # Common: Must be writable by owner/current user
@@ -88,7 +88,7 @@ def _check_state_dir(self) -> PermissionResult:
                 severity=PermissionSeverity.FAIL,
                 message=f"State directory not writable: {path}",
                 code="perm.state_dir.not_writable",
-                remediation="Ensure the process user has write access."
+                remediation="Ensure the process user has write access.",
             )
 
         # POSIX Hardening
@@ -97,13 +97,17 @@ def _check_state_dir(self) -> PermissionResult:
                 mode = path.stat().st_mode
                 if mode & stat.S_IWOTH:
                     # World writable is CRITICAL in Hardened
-                    sev = PermissionSeverity.FAIL if self.profile == RuntimeProfile.HARDENED else PermissionSeverity.WARN
+                    sev = (
+                        PermissionSeverity.FAIL
+                        if self.profile == RuntimeProfile.HARDENED
+                        else PermissionSeverity.WARN
+                    )
                     return PermissionResult(
                         resource="state_dir",
                         severity=sev,
-                         message="State directory is world-writable",
+                        message="State directory is world-writable",
                         code="perm.state_dir.world_writable",
-                        remediation=f"chmod 700 {path}"
+                        remediation=f"chmod 700 {path}",
                     )
             except Exception as e:
                 logger.warning(f"Failed to stat state dir: {e}")
@@ -112,33 +116,37 @@ def _check_state_dir(self) -> PermissionResult:
             resource="state_dir",
             severity=PermissionSeverity.PASS,
             message="State directory permissions OK",
-            code="perm.state_dir.ok"
+            code="perm.state_dir.ok",
         )
 
     def _check_secrets_file(self) -> PermissionResult:
         """Check secrets.json permissions."""
         path = self.state_dir / "secrets.json"
-        
+
         if not path.exists():
-             return PermissionResult(
+            return PermissionResult(
                 resource="secrets_file",
-                severity=PermissionSeverity.PASS, # Not an error to not exist
+                severity=PermissionSeverity.PASS,  # Not an error to not exist
                 message="Secrets file not present",
-                code="perm.secrets.missing"
+                code="perm.secrets.missing",
             )
 
         if self.system != "Windows":
             try:
                 mode = path.stat().st_mode
                 # Check World Readable/Writable
                 if mode & (stat.S_IROTH | stat.S_IWOTH):
-                    sev = PermissionSeverity.FAIL if self.profile == RuntimeProfile.HARDENED else PermissionSeverity.WARN
+                    sev = (
+                        PermissionSeverity.FAIL
+                        if self.profile == RuntimeProfile.HARDENED
+                        else PermissionSeverity.WARN
+                    )
                     return PermissionResult(
                         resource="secrets_file",
                         severity=sev,
                         message="Secrets file is world-accessible",
                         code="perm.secrets.world_accessible",
-                        remediation=f"chmod 600 {path}"
+                        remediation=f"chmod 600 {path}",
                     )
             except Exception as e:
                 logger.warning(f"Failed to stat secrets file: {e}")
@@ -147,7 +155,7 @@ def _check_secrets_file(self) -> PermissionResult:
             resource="secrets_file",
             severity=PermissionSeverity.PASS,
             message="Secrets file permissions OK",
-            code="perm.secrets.ok"
+            code="perm.secrets.ok",
         )
 
 
@@ -158,13 +166,15 @@ def evaluate_startup_permissions() -> Tuple[bool, List[PermissionResult]]:
     """
     evaluator = PermissionEvaluator()
     results = evaluator.evaluate()
-    
+
     # Block startup if any FAIL result exists
     failures = [r for r in results if r.severity == PermissionSeverity.FAIL]
     if failures:
-        logger.critical(f"Startup blocked by permission checks ({len(failures)} failures).")
+        logger.critical(
+            f"Startup blocked by permission checks ({len(failures)} failures)."
+        )
         for f in failures:
             logger.critical(f"  [{f.code}] {f.message} -> {f.remediation}")
         return False, results
-        
+
     return True, results

tests/test_backpressure.py

@@ -1,50 +1,52 @@
-
-import unittest
 import time
+import unittest
+
 from services.observability.backpressure import BoundedQueue
 
+
 class TestBoundedQueue(unittest.TestCase):
-    
+
     def test_capacity_and_drops(self):
         """Test strict capacity enforcement and drop counting."""
         q = BoundedQueue[int](capacity=2)
-        
+
         # 1. Fill to capacity
         self.assertTrue(q.enqueue(1))
         self.assertTrue(q.enqueue(2))
-        
+
         stats = q.stats()
         self.assertEqual(stats.current_size, 2)
         self.assertEqual(stats.high_watermark, 2)
         self.assertEqual(stats.total_dropped, 0)
-        
+
         # 2. Overflow (Drop Oldest)
         self.assertFalse(q.enqueue(3))
-        
+
         stats = q.stats()
         self.assertEqual(stats.current_size, 2)
         self.assertEqual(stats.total_dropped, 1)
         self.assertGreater(stats.last_drop_ts, 0)
-        
+
         # Check content (1 should be dropped, 2 and 3 remain)
         items = q.get_all()
         self.assertEqual(items, [2, 3])
 
     def test_stats_tracking(self):
         """Test cumulative stats logic."""
         q = BoundedQueue[str](capacity=5)
-        
+
         q.enqueue("a")
         q.enqueue("b")
         self.assertEqual(q.stats().high_watermark, 2)
-        
-        q.get_all() # Just reading doesn't change state
-        
+
+        q.get_all()  # Just reading doesn't change state
+
         q.clear()
         stats = q.stats()
         self.assertEqual(stats.current_size, 0)
         self.assertEqual(stats.high_watermark, 0)
         self.assertEqual(stats.total_enqueued, 0)
 
+
 if __name__ == "__main__":
     unittest.main()

tests/test_packs.py

@@ -6,13 +6,13 @@
 import zipfile
 
 from services.packs.pack_archive import PackArchive
-from services.packs.pack_registry import PackRegistry, _validate_pack_segment
 from services.packs.pack_manifest import (
     MAX_MANIFEST_FILES,
     PackError,
     validate_manifest_integrity,
     validate_pack_metadata,
 )
+from services.packs.pack_registry import PackRegistry, _validate_pack_segment
 from services.packs.pack_types import PackMetadata, PackType