resolve merge conflict

Author: sehoon38

packages/core/src/availability/policyHelpers.test.ts

@@ -120,8 +120,6 @@ describe('policyHelpers', () => {
       expect(chain[0]?.model).toBe('gemini-2.5-flash');
       expect(chain[1]?.model).toBe('gemini-2.5-pro');
     });
-<<<<<<< HEAD
-=======
 
     it('proactively returns Gemini 2.5 chain if Gemini 3 requested but user lacks access', () => {
       const config = createMockConfig({
@@ -156,7 +154,6 @@ describe('policyHelpers', () => {
       expect(chain[0]?.model).toBe(PREVIEW_GEMINI_3_1_CUSTOM_TOOLS_MODEL);
       expect(chain[1]?.model).toBe('gemini-3-flash-preview');
     });
->>>>>>> aa9163da6 (feat(core): add policy chain support for Gemini 3.1 (#19991))
   });
 
   describe('buildFallbackPolicyContext', () => {

packages/core/src/availability/policyHelpers.ts

@@ -25,6 +25,7 @@ import {
   DEFAULT_GEMINI_MODEL,
   PREVIEW_GEMINI_MODEL_AUTO,
   isAutoModel,
+  isGemini3Model,
   resolveModel,
 } from '../config/models.js';
 import type { ModelSelectionResult } from './modelAvailabilityService.js';
@@ -56,19 +57,10 @@ export function resolvePolicyChain(
   );
   const isAutoPreferred = preferredModel ? isAutoModel(preferredModel) : false;
   const isAutoConfigured = isAutoModel(configuredModel);
+  const hasAccessToPreview = config.getHasAccessToPreviewModel?.() ?? true;
 
   if (resolvedModel === DEFAULT_GEMINI_FLASH_LITE_MODEL) {
     chain = getFlashLitePolicyChain();
-<<<<<<< HEAD
-  } else if (isAutoPreferred || isAutoConfigured) {
-    const previewEnabled =
-      preferredModel === PREVIEW_GEMINI_MODEL_AUTO ||
-      configuredModel === PREVIEW_GEMINI_MODEL_AUTO;
-    chain = getModelPolicyChain({
-      previewEnabled,
-      userTier: config.getUserTier(),
-    });
-=======
   } else if (
     isGemini3Model(resolvedModel) ||
     isAutoPreferred ||
@@ -95,7 +87,6 @@ export function resolvePolicyChain(
         useCustomToolModel,
       });
     }
->>>>>>> aa9163da6 (feat(core): add policy chain support for Gemini 3.1 (#19991))
   } else {
     chain = createSingleModelChain(modelFromConfig);
   }