fix: resolve merge conflicts with origin/main

- Take origin/main version for all conflicted src/ files:
  AuthorityResolver, CapabilityEngine, NetworkContextBroker,
  PulseGenerator, TrustEngine, EnvironmentResolver
- Take origin/main version for all conflicted test files:
  ClientTelemetryTest, ContextCacheTest, ContextEngineTest,
  IdentityResolverTest, NetworkContextBrokerTest,
  SirusContextTest, SirusEventRepositoryTest

Both CredentialTier (identity/role tier) and TrustLevelPrimitive
(device trust level) coexist in SirusContext as established by
the governance PR #118.

Author: Copilot

src/core/AuthorityResolver.php

@@ -14,11 +14,7 @@
     exit;
 }
 
-<<<<<<< HEAD
-use Starisian\Sparxstar\Infrastructure\DTOs\TrustLevelPrimitive;
-=======
 use Starisian\Sparxstar\Infrastructure\DTOs\CredentialTier;
->>>>>>> origin/main
 
 /**
  * Maps the resolved trust level and WordPress capabilities to a named authority type.
@@ -53,11 +49,7 @@ final class AuthorityResolver
      */
     public function resolve(SirusContext $context): ?string
     {
-<<<<<<< HEAD
-        if ($context->trust_level !== TrustLevelPrimitive::NORMAL) {
-=======
         if ($context->credential_tier !== CredentialTier::AUTHORITY) {
->>>>>>> origin/main
             return null;
         }
 

src/core/CapabilityEngine.php

@@ -22,16 +22,18 @@ final class CapabilityEngine
 {
     /** @var array<string, list<string>> Capabilities granted per trust level. */
     private const BASE_CAPABILITIES = [
-        'NORMAL'            => [
+        'anonymous'   => [ 'read_context' ],
+        'device'      => [ 'read_context', 'submit_environment' ],
+        'contributor' => [ 'read_context', 'submit_environment', 'submit_content' ],
+        'user'        => [ 'read_context', 'submit_environment', 'submit_content', 'read_profile' ],
+        'authority'   => [
             'read_context',
             'submit_environment',
             'submit_content',
             'read_profile',
             'manage_context',
             'resolve_authority',
         ],
-        'STEP_UP_REQUIRED'  => [ 'read_context' ],
-        'LOCKED'            => [],
     ];
 
     /**
@@ -43,13 +45,8 @@ final class CapabilityEngine
      */
     public function resolve(SirusContext $context): array
     {
-<<<<<<< HEAD
-        $capabilities = self::BASE_CAPABILITIES[ $context->trust_level->value ]
-            ?? self::BASE_CAPABILITIES['LOCKED'];
-=======
         $capabilities = self::BASE_CAPABILITIES[ $context->credential_tier->value ]
             ?? self::BASE_CAPABILITIES['anonymous'];
->>>>>>> origin/main
 
         /** @var list<string> $capabilities */
         $capabilities = apply_filters('sparxstar_sirus_capabilities', $capabilities, $context);

src/core/NetworkContextBroker.php

@@ -134,11 +134,7 @@ public function verifyToken(string $token, string $secret): ?SirusContext
                 return null;
             }
         } else {
-<<<<<<< HEAD
-            $trust_level = TrustLevelPrimitive::from('LOCKED');
-=======
             $trust_level = TrustLevelPrimitive::STEP_UP_REQUIRED;
->>>>>>> origin/main
         }
 
         $credential_tier = CredentialTier::tryFrom((string) ($data['ct'] ?? '')) ?? CredentialTier::ANONYMOUS;

src/core/PulseGenerator.php

@@ -139,13 +139,8 @@ private function deriveBehaviorFlags(SirusContext $context): array
 
         if ($context->trust_level === TrustLevelPrimitive::STEP_UP_REQUIRED) {
             $flags[] = 'step_up_required';
-<<<<<<< HEAD
-        } elseif ($context->trust_level === TrustLevelPrimitive::LOCKED) {
-            $flags[] = 'trust_locked';
-=======
             $flags[] = 'trust_level_elevated';
             $flags[] = 'trust_level_critical';
->>>>>>> origin/main
         }
 
         if ($context->trust_score < TrustEngine::NORMAL_THRESHOLD) {

src/core/TrustEngine.php

@@ -69,11 +69,7 @@ final class TrustEngine
     /**
      * Trust level returned when trust_score = 0.0 (fully untrusted).
      */
-<<<<<<< HEAD
-    public const LEVEL_CRITICAL = 'LOCKED';
-=======
     public const LEVEL_CRITICAL = 'STEP_UP_REQUIRED';
->>>>>>> origin/main
 
     /**
      * Computes the trust score from a signal map and returns both score and level.

src/services/EnvironmentResolver.php

@@ -415,12 +415,8 @@ private function resolveWithFallback(string $ua): array
             }
         }
 
-<<<<<<< HEAD
-        if (str_contains($ua, 'iPad') || str_contains($ua, 'Tablet')) {
-=======
         if (str_contains($ua, '(iPad;') || str_contains($ua, 'Tablet')) {
             // iPad UA contains 'Mobile/' suffix, so check tablet tokens first.
->>>>>>> origin/main
             $resolved['device_type'] = 'tablet';
         } elseif (str_contains($ua, 'Mobile') || str_contains($ua, 'iPhone')) {
             $resolved['device_type'] = 'smartphone';

tests/unit/ClientTelemetryTest.php

@@ -65,10 +65,7 @@ public function testRecordInsertsRawReportAndStats(): void
     {
         $this->telemetry->record('js_error', 'Something broke', ['component' => 'collector'], 'dev-1');
 
-<<<<<<< HEAD
-=======
         // queries[0] = INSERT reports, queries[1] = SELECT get_var (existing stats check), queries[2] = INSERT stats
->>>>>>> origin/main
         $this->assertCount(3, $this->wpdb->queries);
         $this->assertSame('wp_sparxstar_client_reports', $this->wpdb->queries[0]['table']);
         $this->assertSame('wp_sparxstar_client_error_stats', $this->wpdb->queries[2]['table']);

tests/unit/ContextCacheTest.php

@@ -45,12 +45,8 @@ private function makeContext(string $ctx_id = 'ctx-test'): SirusContext
             authority_id:   null,
             role_set:       [],
             capabilities:   [],
-<<<<<<< HEAD
-            trust_level:    TrustLevelPrimitive::from('NORMAL'),
-=======
             credential_tier: CredentialTier::ANONYMOUS,
             trust_level:    TrustLevelPrimitive::STEP_UP_REQUIRED,
->>>>>>> origin/main
             trust_score:    1.0,
             issued_at:      time(),
             expires:        time() + 300,

tests/unit/ContextEngineTest.php

@@ -190,7 +190,7 @@ public function testBuildFromDevicePrimesContextCache(): void
             environment_json: '{}',
             first_seen:       time() - 10,
             last_seen:        time(),
-            trust_level:      'NORMAL',
+            trust_level:      'anonymous',
         );
 
         $built = ContextEngine::buildFromDevice($record);
@@ -241,12 +241,8 @@ public function testCurrentEvictsExpiredCacheAndRebuilds(): void
             authority_id:   null,
             role_set:       [],
             capabilities:   [],
-<<<<<<< HEAD
-            trust_level:    TrustLevelPrimitive::from('NORMAL'),
-=======
             credential_tier: CredentialTier::ANONYMOUS,
             trust_level:    TrustLevelPrimitive::STEP_UP_REQUIRED,
->>>>>>> origin/main
             trust_score:    1.0,
             issued_at:      1000,
             expires:        1001, // already expired

tests/unit/IdentityResolverTest.php

@@ -41,12 +41,8 @@ private function makeContext(
             authority_id:   null,
             role_set:       [],
             capabilities:   [],
-<<<<<<< HEAD
-            trust_level:    TrustLevelPrimitive::from('NORMAL'),
-=======
             credential_tier: CredentialTier::ANONYMOUS,
             trust_level:    TrustLevelPrimitive::STEP_UP_REQUIRED,
->>>>>>> origin/main
             trust_score:    1.0,
             issued_at:      time(),
             expires:        0,