feat(server-ai): stamp modelKey and modelVersion on AI usage events (AIC-2858)

packages/sdk/server-ai/__tests__/LDAIClientImpl.test.ts

@@ -846,6 +846,92 @@ describe('createTracker method', () => {
       configKey: 'my-config',
       variationKey: 'v1',
       version: 3,
+      modelVersion: 1,
+    });
+    expect('modelKey' in tracker.getTrackData()).toBe(false);
+  });
+});
+
+describe('modelKey and modelVersion tracking', () => {
+  it('stamps modelKey and modelVersion on tracker from flag payload', async () => {
+    const client = new LDAIClientImpl(mockLdClient);
+    const key = 'test-flag';
+
+    mockLdClient.variation.mockResolvedValue({
+      model: {
+        name: 'gpt-4',
+      },
+      provider: { name: 'openai' },
+      messages: [],
+      _ldMeta: {
+        variationKey: 'v1',
+        enabled: true,
+        mode: 'completion',
+        version: 7,
+        modelKey: 'my-model',
+        modelVersion: 2,
+      },
+    });
+
+    const result = await client.completionConfig(key, testContext);
+    const tracker = result.createTracker();
+
+    expect(tracker.getTrackData()).toMatchObject({
+      modelKey: 'my-model',
+      modelVersion: 2,
+    });
+  });
+
+  it('defaults modelVersion to 1 and omits modelKey when absent from flag payload', async () => {
+    const client = new LDAIClientImpl(mockLdClient);
+    const key = 'test-flag';
+
+    mockLdClient.variation.mockResolvedValue({
+      model: { name: 'gpt-4' },
+      provider: { name: 'openai' },
+      messages: [],
+      _ldMeta: {
+        variationKey: 'v1',
+        enabled: true,
+        mode: 'completion',
+        version: 7,
+      },
+    });
+
+    const result = await client.completionConfig(key, testContext);
+    const tracker = result.createTracker();
+
+    const trackData = tracker.getTrackData();
+    expect('modelKey' in trackData).toBe(false);
+    expect(trackData.modelVersion).toBe(1);
+  });
+
+  it('does not expose modelKey or modelVersion on config.model', async () => {
+    // modelKey/modelVersion are intentionally not exposed on LDModelConfig (they'd read as
+    // properties of the LLM itself, e.g. a version like "5.4"); the only place they surface is
+    // the tracker's stamped event data, mirroring variationKey/version.
+    const client = new LDAIClientImpl(mockLdClient);
+    const key = 'test-flag';
+
+    mockLdClient.variation.mockResolvedValue({
+      model: {
+        name: 'gpt-4',
+      },
+      provider: { name: 'openai' },
+      messages: [],
+      _ldMeta: {
+        variationKey: 'v1',
+        enabled: true,
+        mode: 'completion',
+        modelKey: 'my-model',
+        modelVersion: 2,
+      },
+    });
+
+    const result = await client.completionConfig(key, testContext);
+
+    expect(result.model).toEqual({
+      name: 'gpt-4',
     });
   });
 });

packages/sdk/server-ai/__tests__/LDAIConfigTrackerImpl.test.ts

@@ -31,6 +31,7 @@ const getExpectedTrackData = () => ({
   version,
   modelName,
   providerName,
+  modelVersion: 1,
   runId: testRunId,
 });
 
@@ -1193,3 +1194,108 @@ describe('fromResumptionToken', () => {
     expect('graphKey' in reconstructed.getTrackData()).toBe(false);
   });
 });
+
+it('includes modelKey and modelVersion in getTrackData when set on constructor', () => {
+  const tracker = new LDAIConfigTrackerImpl(
+    mockLdClient,
+    testRunId,
+    configKey,
+    variationKey,
+    version,
+    modelName,
+    providerName,
+    testContext,
+    undefined,
+    'my-model',
+    2,
+  );
+
+  expect(tracker.getTrackData()).toEqual({
+    ...getExpectedTrackData(),
+    modelKey: 'my-model',
+    modelVersion: 2,
+  });
+});
+
+it('omits modelKey from getTrackData when unset', () => {
+  const tracker = new LDAIConfigTrackerImpl(
+    mockLdClient,
+    testRunId,
+    configKey,
+    variationKey,
+    version,
+    modelName,
+    providerName,
+    testContext,
+  );
+
+  const trackData = tracker.getTrackData();
+  expect('modelKey' in trackData).toBe(false);
+  expect(trackData.modelVersion).toBe(1);
+});
+
+it('omits modelKey from getTrackData when empty string', () => {
+  const tracker = new LDAIConfigTrackerImpl(
+    mockLdClient,
+    testRunId,
+    configKey,
+    variationKey,
+    version,
+    modelName,
+    providerName,
+    testContext,
+    undefined,
+    '',
+    3,
+  );
+
+  const trackData = tracker.getTrackData();
+  expect('modelKey' in trackData).toBe(false);
+  expect(trackData.modelVersion).toBe(3);
+});
+
+it('excludes modelKey and modelVersion from resumption token', () => {
+  const tracker = new LDAIConfigTrackerImpl(
+    mockLdClient,
+    testRunId,
+    configKey,
+    variationKey,
+    version,
+    modelName,
+    providerName,
+    testContext,
+    undefined,
+    'my-model',
+    2,
+  );
+
+  const decoded = JSON.parse(Buffer.from(tracker.resumptionToken, 'base64url').toString('utf8'));
+  expect('modelKey' in decoded).toBe(false);
+  expect('modelVersion' in decoded).toBe(false);
+});
+
+it('fromResumptionToken defaults modelVersion to 1 and omits modelKey', () => {
+  const original = new LDAIConfigTrackerImpl(
+    mockLdClient,
+    testRunId,
+    configKey,
+    variationKey,
+    version,
+    modelName,
+    providerName,
+    testContext,
+    undefined,
+    'my-model',
+    2,
+  );
+
+  const reconstructed = LDAIConfigTrackerImpl.fromResumptionToken(
+    original.resumptionToken,
+    mockLdClient,
+    testContext,
+  );
+
+  const trackData = reconstructed.getTrackData();
+  expect('modelKey' in trackData).toBe(false);
+  expect(trackData.modelVersion).toBe(1);
+});

packages/sdk/server-ai/src/LDAIClientImpl.ts

@@ -106,6 +106,10 @@ export class LDAIClientImpl implements LDAIClient {
         value.provider?.name ?? '',
         context,
         graphKey,
+        // eslint-disable-next-line no-underscore-dangle
+        value._ldMeta?.modelKey,
+        // eslint-disable-next-line no-underscore-dangle
+        value._ldMeta?.modelVersion ?? 1,
       );
 
     // Validate mode match

packages/sdk/server-ai/src/LDAIConfigTrackerImpl.ts

@@ -19,6 +19,8 @@ export class LDAIConfigTrackerImpl implements LDAIConfigTracker {
     private _providerName: string,
     private _context: LDContext,
     private _graphKey?: string,
+    private _modelKey?: string,
+    private _modelVersion: number = 1,
   ) {
     this._trackedMetrics.resumptionToken = this.resumptionToken;
   }
@@ -30,6 +32,8 @@ export class LDAIConfigTrackerImpl implements LDAIConfigTracker {
     version: number;
     modelName: string;
     providerName: string;
+    modelVersion: number;
+    modelKey?: string;
     graphKey?: string;
   } {
     return {
@@ -39,6 +43,8 @@ export class LDAIConfigTrackerImpl implements LDAIConfigTracker {
       version: this._version,
       modelName: this._modelName,
       providerName: this._providerName,
+      modelVersion: this._modelVersion,
+      ...(this._modelKey ? { modelKey: this._modelKey } : {}),
       ...(this._graphKey !== undefined ? { graphKey: this._graphKey } : {}),
     };
   }

packages/sdk/server-ai/src/api/config/LDAIConfigTracker.ts

@@ -22,6 +22,8 @@ export interface LDAIConfigTracker {
     version: number;
     modelName: string;
     providerName: string;
+    modelVersion: number;
+    modelKey?: string;
     graphKey?: string;
   };
 

packages/sdk/server-ai/src/api/config/LDAIConfigUtils.ts

@@ -26,6 +26,8 @@ export interface LDAIConfigFlagValue {
     enabled: boolean;
     version?: number;
     mode?: LDAIConfigMode;
+    modelKey?: string;
+    modelVersion?: number;
   };
   model?: LDModelConfig;
   messages?: LDMessage[];