fix: resolve policy from report period

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: asizikov

src/pipeline/aicIncludedCredits.test.ts

@@ -2,6 +2,7 @@ import { describe, expect, it } from 'vitest'
 import {
   BUSINESS_MONTHLY_AIC_INCLUDED_CREDITS,
   BUSINESS_MONTHLY_QUOTA,
+  calculateAicIncludedCreditsContext,
   calculateAicIncludedCreditsPool,
   calculateLicenseSummary,
   ENTERPRISE_MONTHLY_AIC_INCLUDED_CREDITS,
@@ -51,13 +52,41 @@ const HEADER = [
   'aic_quantity',
   'aic_gross_amount',
 ].join(',')
+const NATIVE_AI_CREDITS_HEADER = [
+  'date',
+  'username',
+  'product',
+  'sku',
+  'model',
+  'quantity',
+  'unit_type',
+  'applied_cost_per_quantity',
+  'gross_amount',
+  'discount_amount',
+  'net_amount',
+  'total_monthly_quota',
+  'organization',
+  'cost_center_name',
+  'aic_quantity',
+  'aic_gross_amount',
+].join(',')
+const NATIVE_AI_CREDITS_REPORT_METADATA = {
+  format: 'native-ai-credits',
+  label: 'Native AI Credits report',
+  supported: false,
+} as const
 const UNKNOWN_HIGH_MONTHLY_QUOTA = 2147483647
 
 function createCsv(rows: string[][]): File {
   const body = [HEADER, ...rows.map((row) => row.join(','))].join('\n')
   return new File([body], 'usage.csv', { type: 'text/csv' })
 }
 
+function createNativeCsv(rows: string[][]): File {
+  const body = [NATIVE_AI_CREDITS_HEADER, ...rows.map((row) => row.join(','))].join('\n')
+  return new File([body], 'usage.csv', { type: 'text/csv' })
+}
+
 function createRecord(overrides: Partial<TokenUsageRecord> = {}): TokenUsageRecord {
   return {
     date: '2026-03-01',
@@ -325,6 +354,26 @@ describe('AIC included credit tiering and pool sizing', () => {
     )
   })
 
+  it('derives native report periods before selecting native included credit policies', async () => {
+    const summerFile = createNativeCsv([
+      ['2026-08-31', 'mona', 'copilot', 'copilot_ai_credit', 'GPT-5', '10', 'ai-credits', '0.01', '0.10', '0', '0.10', '3900', 'example-org', 'Cost Center A', '10', '0.10'],
+    ])
+    const standardFile = createNativeCsv([
+      ['2026-09-01', 'mona', 'copilot', 'copilot_ai_credit', 'GPT-5', '10', 'ai-credits', '0.01', '0.10', '0', '0.10', '3900', 'example-org', 'Cost Center A', '10', '0.10'],
+    ])
+
+    await expect(calculateAicIncludedCreditsContext(summerFile, {}, {
+      reportMetadata: NATIVE_AI_CREDITS_REPORT_METADATA,
+    })).resolves.toMatchObject({
+      organizationIncludedCreditsPool: 7000,
+    })
+    await expect(calculateAicIncludedCreditsContext(standardFile, {}, {
+      reportMetadata: NATIVE_AI_CREDITS_REPORT_METADATA,
+    })).resolves.toMatchObject({
+      organizationIncludedCreditsPool: 3900,
+    })
+  })
+
   it('uses the maximum quota seen for the same user before applying individual-plan classification', async () => {
     const file = createCsv([
       ['2026-03-01', 'mona', 'copilot', 'copilot_ai_credit', 'GPT-5', '10', 'ai-credits', '0.01', '0.10', '0', '0.10', 'False', '300', 'octo', 'Cats', '10', '0.10'],

src/pipeline/aicIncludedCredits.ts

@@ -7,11 +7,15 @@ import {
 } from './parser'
 import {
   TRANSITION_PERIOD_INCLUDED_CREDITS_POLICY,
+  resolveIncludedCreditsPolicy,
   type IncludedCreditsPolicy,
   type OrganizationIncludedCreditTier,
   type PlanIdentity,
+  type ReportPeriod,
 } from './includedCreditsPolicy'
+import { isValidIsoDate } from './isoDate'
 import { streamLines, type StreamProgress } from './streamer'
+import type { ReportFormatMetadata } from './reportAdapters'
 
 type IndividualPlan = 'pro-student' | 'pro-plus'
 
@@ -87,6 +91,7 @@ export type LicenseSummary = {
 export interface AicIncludedCreditsProgressOptions {
   onProgress?: (progress: StreamProgress) => void
   includedCreditsPolicy?: IncludedCreditsPolicy
+  reportMetadata?: ReportFormatMetadata
 }
 
 type ReportScopeUser = {
@@ -224,6 +229,31 @@ export function getIndividualMonthlyAicIncludedCredits(
   return findIndividualIncludedCreditsPlan(totalMonthlyQuota, reportPlanScope)?.monthlyIncludedCredits ?? 0
 }
 
+function includeDateInReportPeriod(reportPeriod: ReportPeriod, rawDate: string): ReportPeriod {
+  const date = rawDate.trim()
+  if (!isValidIsoDate(date)) return reportPeriod
+
+  return {
+    startDate: !reportPeriod.startDate || date < reportPeriod.startDate ? date : reportPeriod.startDate,
+    endDate: !reportPeriod.endDate || date > reportPeriod.endDate ? date : reportPeriod.endDate,
+  }
+}
+
+function resolvePolicyForContext(
+  options: AicIncludedCreditsProgressOptions | undefined,
+  reportPeriod: ReportPeriod,
+): IncludedCreditsPolicy {
+  if (options?.includedCreditsPolicy) {
+    return options.includedCreditsPolicy
+  }
+
+  if (options?.reportMetadata) {
+    return resolveIncludedCreditsPolicy(options.reportMetadata, reportPeriod)
+  }
+
+  return TRANSITION_PERIOD_INCLUDED_CREDITS_POLICY
+}
+
 export function calculateLicenseSummary(
   users: Array<{ totalMonthlyQuota: number } & ReportScopeUser>,
   policy: IncludedCreditsPolicy = TRANSITION_PERIOD_INCLUDED_CREDITS_POLICY,
@@ -274,10 +304,10 @@ export async function calculateAicIncludedCreditsContext(
   overrides: AicIncludedCreditsOverrides = {},
   options?: AicIncludedCreditsProgressOptions,
 ): Promise<AicIncludedCreditsContext> {
-  const includedCreditsPolicy = options?.includedCreditsPolicy ?? TRANSITION_PERIOD_INCLUDED_CREDITS_POLICY
   let header: TokenUsageHeader | null = null
-  const quotasByUser = new Map<string, number>()
+  const quotaCandidatesByUser = new Map<string, Set<number>>()
   let hasOrganizationContext = false
+  let reportPeriod: ReportPeriod = {}
 
   for await (const line of streamLines(file, options)) {
     const trimmed = line.trimEnd()
@@ -291,22 +321,30 @@ export async function calculateAicIncludedCreditsContext(
     const record = parseNormalizedTokenUsageRecord(trimmed, header)
     if (!record) continue
 
+    reportPeriod = includeDateInReportPeriod(reportPeriod, record.date)
+
     const username = record.username.trim()
     if (!username) continue
 
     if (record.organization.trim() || (record.cost_center_name?.trim() ?? '')) {
       hasOrganizationContext = true
     }
 
-    const currentQuota = quotasByUser.get(username) ?? 0
-    quotasByUser.set(username, selectKnownMonthlyQuota(
-      currentQuota,
-      record.total_monthly_quota,
-      includedCreditsPolicy,
-    ))
+    const quotaCandidates = quotaCandidatesByUser.get(username) ?? new Set<number>()
+    quotaCandidates.add(record.total_monthly_quota)
+    quotaCandidatesByUser.set(username, quotaCandidates)
   }
 
-  const reportPlanScope = inferReportPlanScope(quotasByUser.size, hasOrganizationContext)
+  const includedCreditsPolicy = resolvePolicyForContext(options, reportPeriod)
+  const quotasByUser = new Map<string, number>()
+  quotaCandidatesByUser.forEach((quotaCandidates, username) => {
+    quotasByUser.set(username, Array.from(quotaCandidates).reduce(
+      (currentQuota, candidateQuota) => selectKnownMonthlyQuota(currentQuota, candidateQuota, includedCreditsPolicy),
+      0,
+    ))
+  })
+
+  const reportPlanScope = inferReportPlanScope(quotaCandidatesByUser.size, hasOrganizationContext)
   if (reportPlanScope === 'individual') {
     const quota = quotasByUser.values().next().value ?? 0
     return {

src/pipeline/runPipeline.test.ts

@@ -132,7 +132,7 @@ describe('runPipeline', () => {
     expect(aggregator.result()).toEqual([])
   })
 
-  it('rejects native AI Credits reports before processing rows', async () => {
+  it('rejects native AI Credits reports before aggregator calls', async () => {
     const file = createCsv([
       [
         '5/29/26',
@@ -186,6 +186,23 @@ describe('runPipeline', () => {
     })
   })
 
+  it('keeps transition-period allocation for supported reports after the native policy boundary', async () => {
+    const file = createCsv([
+      ['2026-09-01', 'mona', 'copilot', 'copilot_ai_credit', 'GPT-5', '3000', 'ai-credits', '0.01', '30.00', '0', '30.00', 'False', '300', 'example-org', 'Cost Center A', '3000', '30.00'],
+    ])
+    const aggregator = new CaptureAggregator()
+
+    await runPipeline(file, [aggregator])
+
+    expect(aggregator.result()).toEqual([
+      expect.objectContaining({
+        username: 'mona',
+        total_monthly_quota: 300,
+        aic_net_amount: 0,
+      }),
+    ])
+  })
+
   it('emits weighted progress for analysis and processing stages', async () => {
     const file = createCsv([
       ['2026-03-01', 'mona', 'copilot', 'copilot_ai_credit', 'GPT-5', '10', 'ai-credits', '0.01', '0.10', '0', '0.10', 'False', '300', 'octo', 'Cost Center A', '10', '0.10'],

src/pipeline/runPipeline.ts

@@ -1,6 +1,5 @@
 import type { Aggregator } from './aggregators/base'
 import { createAicIncludedCreditsAllocator, type AicIncludedCreditsOverrides } from './aicIncludedCredits'
-import { resolveIncludedCreditsPolicy } from './includedCreditsPolicy'
 import {
   InvalidReportError,
   parseTokenUsageHeader,
@@ -93,7 +92,6 @@ export async function runPipeline(
   const { includedCreditsOverrides = {}, progressResolution = 500, onProgress } = options ?? {}
   const reportAdapter = await validateFileFormat(file)
   const reportMetadata = reportAdapter.metadata
-  const includedCreditsPolicy = resolveIncludedCreditsPolicy(reportMetadata)
   let lastProgressStage: PipelineProgress['stage'] | null = null
   let lastProgressPercent = -1
   let lastProgressTimestamp = 0
@@ -140,7 +138,7 @@ export async function runPipeline(
   }
 
   const aicIncludedCreditAllocator = await createAicIncludedCreditsAllocator(file, includedCreditsOverrides, {
-    includedCreditsPolicy,
+    reportMetadata,
     onProgress: (streamProgress) => {
       emitProgress('analyzing', 0, streamProgress)
     },