diff --git a/genkit-tools/common/src/types/eval.ts b/genkit-tools/common/src/types/eval.ts
index 00ef8609a8..a72fa03b40 100644
--- a/genkit-tools/common/src/types/eval.ts
+++ b/genkit-tools/common/src/types/eval.ts
@@ -95,6 +95,7 @@ export type EvalResult = z.infer<typeof EvalResultSchema>;
  */
 export const EvalRunKeySchema = z.object({
   actionRef: z.string().optional(),
+  datasetId: z.string().optional(),
   evalRunId: z.string(),
   createdAt: z.string(),
 });
diff --git a/js/ai/tests/generate/generate_test.ts b/js/ai/tests/generate/generate_test.ts
index a20d856f2b..67173d6da7 100644
--- a/js/ai/tests/generate/generate_test.ts
+++ b/js/ai/tests/generate/generate_test.ts
@@ -17,7 +17,7 @@
 import assert from 'node:assert';
 import { describe, it } from 'node:test';
 import { z } from 'zod';
-import { generate, GenerateResponseChunk } from '../../src/generate';
+import { GenerateResponseChunk, generate } from '../../src/generate';
 import {
   Candidate,
   GenerateOptions,
@@ -25,7 +25,7 @@ import {
   Message,
   toGenerateRequest,
 } from '../../src/generate.js';
-import { defineModel, GenerateResponseChunkData } from '../../src/model';
+import { GenerateResponseChunkData, defineModel } from '../../src/model';
 import {
   CandidateData,
   GenerateRequest,