diff --git a/js/ai/src/index.ts b/js/ai/src/index.ts
index 06df9efec3..32fed5fa3f 100644
--- a/js/ai/src/index.ts
+++ b/js/ai/src/index.ts
@@ -15,35 +15,35 @@
  */
 
 export {
-  EvaluatorAction,
-  EvaluatorInfo,
-  EvaluatorReference,
   evaluate,
   evaluatorRef,
+  type EvaluatorAction,
+  type EvaluatorInfo,
+  type EvaluatorReference,
 } from './evaluator.js';
 export {
   Candidate,
-  GenerateOptions,
   GenerateResponse,
-  GenerateStreamOptions,
-  GenerateStreamResponse,
   Message,
   generate,
   generateStream,
   toGenerateRequest,
+  type GenerateOptions,
+  type GenerateStreamOptions,
+  type GenerateStreamResponse,
 } from './generate.js';
-export { PromptAction, definePrompt, renderPrompt } from './prompt.js';
+export { definePrompt, renderPrompt, type PromptAction } from './prompt.js';
 export {
-  IndexerAction,
-  IndexerInfo,
-  IndexerReference,
-  RetrieverAction,
-  RetrieverInfo,
-  RetrieverReference,
   index,
   indexerRef,
   retrieve,
   retrieverRef,
+  type IndexerAction,
+  type IndexerInfo,
+  type IndexerReference,
+  type RetrieverAction,
+  type RetrieverInfo,
+  type RetrieverReference,
 } from './retriever.js';
-export { ToolAction, asTool, defineTool } from './tool.js';
+export { asTool, defineTool, type ToolAction } from './tool.js';
 export * from './types.js';
diff --git a/js/ai/src/retriever.ts b/js/ai/src/retriever.ts
index 1ea4d9a4e8..5df8b7916c 100644
--- a/js/ai/src/retriever.ts
+++ b/js/ai/src/retriever.ts
@@ -22,11 +22,11 @@ import { EmbedderInfo } from './embedder.js';
 
 export {
   Document,
-  DocumentData,
   DocumentDataSchema,
-  MediaPart,
-  Part,
-  TextPart,
+  type DocumentData,
+  type MediaPart,
+  type Part,
+  type TextPart,
 } from './document.js';
 
 type RetrieverFn<RetrieverOptions extends z.ZodTypeAny> = (
diff --git a/js/flow/src/index.ts b/js/flow/src/index.ts
index 81828e1851..2653fadca5 100644
--- a/js/flow/src/index.ts
+++ b/js/flow/src/index.ts
@@ -15,27 +15,27 @@
  */
 
 export {
-  FlowState,
   FlowStateExecutionSchema,
-  FlowStateStore,
-  Operation,
   OperationSchema,
+  type FlowState,
+  type FlowStateStore,
+  type Operation,
 } from '@genkit-ai/core';
 export { FirestoreStateStore } from './firestoreStateStore.js';
 export {
   Flow,
-  FlowAuthPolicy,
-  FlowWrapper,
-  StepsFunction,
-  __RequestWithAuth,
   defineFlow,
   runFlow,
   startFlowsServer,
   streamFlow,
+  type FlowAuthPolicy,
+  type FlowWrapper,
+  type StepsFunction,
+  type __RequestWithAuth,
 } from './flow.js';
 export { run, runAction, runMap } from './steps.js';
 export {
-  FlowInvokeEnvelopeMessage,
   FlowInvokeEnvelopeMessageSchema,
+  type FlowInvokeEnvelopeMessage,
 } from './types.js';
 export { getFlowAuth } from './utils.js';
diff --git a/js/plugins/evaluators/src/index.ts b/js/plugins/evaluators/src/index.ts
index d26410428a..14cd5f14a2 100644
--- a/js/plugins/evaluators/src/index.ts
+++ b/js/plugins/evaluators/src/index.ts
@@ -29,7 +29,7 @@ import {
   answerRelevancyScore,
   faithfulnessScore,
   maliciousnessScore,
-} from './metrics';
+} from './metrics/index.js';
 import { GenkitMetric } from './types.js';
 export { GenkitMetric };