diff --git a/amplify-migration-apps/app-4/src/App.tsx b/amplify-migration-apps/app-4/src/App.tsx
index 527cbbd0cd..3e16ce0fab 100644
--- a/amplify-migration-apps/app-4/src/App.tsx
+++ b/amplify-migration-apps/app-4/src/App.tsx
@@ -510,15 +510,15 @@ const FoodSearch: React.FC<{ user?: AuthUser; onFoodSelect: (food: any) => void
 
   async function searchFood() {
     if (!searchTerm.trim() || !user) return;
-    
+
     try {
       setLoading(true);
       const response = await get({
         apiName: 'nutritionapi',
-        path: `/nutrition/search/${encodeURIComponent(searchTerm)}`
+        path: `/nutrition/search/${encodeURIComponent(searchTerm)}`,
       }).response;
-      
-      const data = await response.body.json() as any;
+
+      const data = (await response.body.json()) as any;
       if (data && data.success) {
         setSearchResults(data.results);
       }
@@ -541,17 +541,20 @@ const FoodSearch: React.FC<{ user?: AuthUser; onFoodSelect: (food: any) => void
           style={{ ...themedStyles.input, marginBottom: 0, flex: 1 }}
           placeholder="Search foods (apple, chicken, etc.)"
         />
-        <button 
-          style={{ ...themedStyles.editButton, padding: '8px 16px' }}
-          onClick={searchFood}
-          disabled={loading || !searchTerm.trim()}
-        >
+        <button style={{ ...themedStyles.editButton, padding: '8px 16px' }} onClick={searchFood} disabled={loading || !searchTerm.trim()}>
           {loading ? '⏳' : '🔍'}
         </button>
       </div>
-      
+
       {searchResults.length > 0 && (
-        <div style={{ maxHeight: 200, overflowY: 'auto', border: theme === 'dark' ? '1px solid #4a5568' : '1px solid #e1e8ed', borderRadius: 6 }}>
+        <div
+          style={{
+            maxHeight: 200,
+            overflowY: 'auto',
+            border: theme === 'dark' ? '1px solid #4a5568' : '1px solid #e1e8ed',
+            borderRadius: 6,
+          }}
+        >
           {searchResults.map((food) => (
             <div
               key={food.id}
@@ -559,7 +562,7 @@ const FoodSearch: React.FC<{ user?: AuthUser; onFoodSelect: (food: any) => void
                 padding: 8,
                 borderBottom: theme === 'dark' ? '1px solid #4a5568' : '1px solid #e1e8ed',
                 cursor: 'pointer',
-                backgroundColor: theme === 'dark' ? '#2d3748' : 'white'
+                backgroundColor: theme === 'dark' ? '#2d3748' : 'white',
               }}
               onClick={() => onFoodSelect(food)}
             >
@@ -586,7 +589,7 @@ const MealLogger: React.FC<{ user?: AuthUser; onMealLogged: () => void }> = ({ u
 
   async function logMeal() {
     if (!selectedFood || !user) return;
-    
+
     try {
       setLogging(true);
       const response = await post({
@@ -596,12 +599,12 @@ const MealLogger: React.FC<{ user?: AuthUser; onMealLogged: () => void }> = ({ u
           body: {
             foodId: selectedFood.id,
             quantity,
-            mealType
-          }
-        }
+            mealType,
+          },
+        },
       }).response;
-      
-      const data = await response.body.json() as any;
+
+      const data = (await response.body.json()) as any;
       if (data && data.success) {
         setSelectedFood(null);
         setQuantity(1);
@@ -619,7 +622,7 @@ const MealLogger: React.FC<{ user?: AuthUser; onMealLogged: () => void }> = ({ u
   return (
     <div>
       <FoodSearch user={user} onFoodSelect={setSelectedFood} />
-      
+
       {selectedFood && (
         <div style={{ padding: 12, backgroundColor: theme === 'dark' ? '#374151' : '#f8f9fa', borderRadius: 8, marginBottom: 16 }}>
           <h4 style={{ margin: '0 0 8px 0', fontSize: 16 }}>Log: {selectedFood.name}</h4>
@@ -637,11 +640,7 @@ const MealLogger: React.FC<{ user?: AuthUser; onMealLogged: () => void }> = ({ u
             </div>
             <div>
               <label style={{ fontSize: 12, color: themedStyles.todoDescription.color }}>Meal:</label>
-              <select
-                value={mealType}
-                onChange={(e) => setMealType(e.target.value)}
-                style={{ ...themedStyles.input, marginBottom: 0 }}
-              >
+              <select value={mealType} onChange={(e) => setMealType(e.target.value)} style={{ ...themedStyles.input, marginBottom: 0 }}>
                 <option value="breakfast">🍳 Breakfast</option>
                 <option value="lunch">🥗 Lunch</option>
                 <option value="dinner">🍽️ Dinner</option>
@@ -653,17 +652,10 @@ const MealLogger: React.FC<{ user?: AuthUser; onMealLogged: () => void }> = ({ u
             Total: {Math.round(selectedFood.calories * quantity)} calories
           </div>
           <div style={{ display: 'flex', gap: 8 }}>
-            <button 
-              style={themedStyles.saveButton}
-              onClick={logMeal}
-              disabled={logging}
-            >
+            <button style={themedStyles.saveButton} onClick={logMeal} disabled={logging}>
               {logging ? '⏳' : '✅'} Log Meal
             </button>
-            <button 
-              style={themedStyles.cancelButton}
-              onClick={() => setSelectedFood(null)}
-            >
+            <button style={themedStyles.cancelButton} onClick={() => setSelectedFood(null)}>
               ❌ Cancel
             </button>
           </div>
@@ -681,16 +673,16 @@ const NutritionSummary: React.FC<{ user?: AuthUser; refreshTrigger: number }> =
 
   async function fetchNutritionSummary() {
     if (!user) return;
-    
+
     try {
       setLoading(true);
       const today = new Date().toISOString().split('T')[0];
       const response = await get({
         apiName: 'nutritionapi',
-        path: `/nutrition/daily/${today}`
+        path: `/nutrition/daily/${today}`,
       }).response;
-      
-      const data = await response.body.json() as any;
+
+      const data = (await response.body.json()) as any;
       if (data && data.success) {
         setNutritionData(data.summary);
       }
@@ -711,15 +703,11 @@ const NutritionSummary: React.FC<{ user?: AuthUser; refreshTrigger: number }> =
     <div style={{ ...themedStyles.todo, marginBottom: 24 }}>
       <div style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 16 }}>
         <h3 style={{ ...themedStyles.todoName, margin: 0 }}>🍎 Today's Nutrition</h3>
-        <button 
-          style={{ ...themedStyles.editButton, padding: '4px 8px', fontSize: 12 }} 
-          onClick={fetchNutritionSummary}
-          disabled={loading}
-        >
+        <button style={{ ...themedStyles.editButton, padding: '4px 8px', fontSize: 12 }} onClick={fetchNutritionSummary} disabled={loading}>
           {loading ? '⏳' : '🔄'} Refresh
         </button>
       </div>
-      
+
       {nutritionData ? (
         <div>
           <div style={{ display: 'grid', gridTemplateColumns: 'repeat(4, 1fr)', gap: 12, marginBottom: 16 }}>
@@ -740,12 +728,20 @@ const NutritionSummary: React.FC<{ user?: AuthUser; refreshTrigger: number }> =
               <div style={{ fontSize: 12, color: themedStyles.todoDescription.color }}>Fat</div>
             </div>
           </div>
-          
+
           <div style={{ fontSize: 14, color: themedStyles.todoDescription.color }}>
-            <p style={{ margin: '4px 0' }}>🍳 Breakfast: {nutritionData.meals.breakfast.calories} cal ({nutritionData.meals.breakfast.items} items)</p>
-            <p style={{ margin: '4px 0' }}>🥗 Lunch: {nutritionData.meals.lunch.calories} cal ({nutritionData.meals.lunch.items} items)</p>
-            <p style={{ margin: '4px 0' }}>🍽️ Dinner: {nutritionData.meals.dinner.calories} cal ({nutritionData.meals.dinner.items} items)</p>
-            <p style={{ margin: '4px 0' }}>🍿 Snacks: {nutritionData.meals.snacks.calories} cal ({nutritionData.meals.snacks.items} items)</p>
+            <p style={{ margin: '4px 0' }}>
+              🍳 Breakfast: {nutritionData.meals.breakfast.calories} cal ({nutritionData.meals.breakfast.items} items)
+            </p>
+            <p style={{ margin: '4px 0' }}>
+              🥗 Lunch: {nutritionData.meals.lunch.calories} cal ({nutritionData.meals.lunch.items} items)
+            </p>
+            <p style={{ margin: '4px 0' }}>
+              🍽️ Dinner: {nutritionData.meals.dinner.calories} cal ({nutritionData.meals.dinner.items} items)
+            </p>
+            <p style={{ margin: '4px 0' }}>
+              🍿 Snacks: {nutritionData.meals.snacks.calories} cal ({nutritionData.meals.snacks.items} items)
+            </p>
           </div>
         </div>
       ) : (
@@ -1623,12 +1619,12 @@ const AuthenticatedApp: React.FC<AppProps> = ({ signOut, user }) => {
           ) : showNutritionForm ? (
             <div>
               <h2 style={themedStyles.formTitle}>Log Food</h2>
-              <MealLogger 
-                user={user} 
+              <MealLogger
+                user={user}
                 onMealLogged={() => {
-                  setNutritionRefresh(prev => prev + 1);
+                  setNutritionRefresh((prev) => prev + 1);
                   setShowNutritionForm(false);
-                }} 
+                }}
               />
               <button style={themedStyles.cancelButton} onClick={() => setShowNutritionForm(false)}>
                 ❌ Cancel
@@ -1665,7 +1661,7 @@ const AuthenticatedApp: React.FC<AppProps> = ({ signOut, user }) => {
         <div>
           {/* Nutrition Summary */}
           <NutritionSummary user={user} refreshTrigger={nutritionRefresh} />
-          
+
           {/* Workout Programs */}
           {projects.length > 0 && (
             <div style={{ display: 'flex', flexWrap: 'wrap', gap: 24, marginBottom: 24, alignItems: 'flex-start' }}>
diff --git a/packages/amplify-cli/package.json b/packages/amplify-cli/package.json
index 359541c48b..ca9032eb40 100644
--- a/packages/amplify-cli/package.json
+++ b/packages/amplify-cli/package.json
@@ -88,6 +88,7 @@
     "amplify-python-function-runtime-provider": "2.4.54",
     "aws-cdk-lib": "~2.189.1",
     "bottleneck": "2.19.5",
+    "cdk-from-cfn": "^0.263.0",
     "chalk": "^4.1.1",
     "ci-info": "^3.8.0",
     "cli-table3": "^0.6.0",
diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/backend/synthesizer.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/backend/synthesizer.ts
index d97b308edd..c692756928 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/backend/synthesizer.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/backend/synthesizer.ts
@@ -50,6 +50,9 @@ export interface BackendRenderParameters {
     importFrom: string;
     functionNamesAndCategories: Map<string, string>;
   };
+  analytics?: {
+    importFrom: string;
+  };
   customResources?: Map<string, string>;
   unsupportedCategories?: Map<string, string>;
 }
@@ -863,6 +866,12 @@ export class BackendSynthesizer {
 
     imports.push(this.createImportStatement([backendFunctionIdentifier], '@aws-amplify/backend'));
 
+    // Analytics: import { analytics } from './analytics/resource';
+    if (renderArgs.analytics) {
+      const analyticsFunctionIdentifier = factory.createIdentifier('analytics');
+      imports.push(this.createImportStatement([analyticsFunctionIdentifier], renderArgs.analytics.importFrom));
+    }
+
     // Add CDK imports for REST API if needed
     if (renderArgs.data?.restApis && renderArgs.function) {
       const functionNameCategories = renderArgs.function.functionNamesAndCategories;
@@ -940,6 +949,14 @@ export class BackendSynthesizer {
       factory.createVariableDeclarationList([backendVariable], ts.NodeFlags.Const),
     );
 
+    // Analytics: call analytics(backend) after defineBackend to create the nested stack
+    if (renderArgs.analytics) {
+      const analyticsCall = factory.createExpressionStatement(
+        factory.createCallExpression(factory.createIdentifier('analytics'), undefined, [factory.createIdentifier('backend')]),
+      );
+      nodes.push(analyticsCall);
+    }
+
     // CDK OVERRIDES
     // When you have advanced user pool settings AND you're creating new auth (not importing existing)
     if (renderArgs.auth?.userPoolOverrides && !renderArgs?.auth?.referenceAuth) {
diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/app_analytics_definition_fetcher.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/app_analytics_definition_fetcher.ts
new file mode 100644
index 0000000000..9a76ff64b3
--- /dev/null
+++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/app_analytics_definition_fetcher.ts
@@ -0,0 +1,21 @@
+import assert from 'node:assert';
+import { BackendEnvironmentResolver } from './backend_environment_selector';
+import { StateManager } from '@aws-amplify/amplify-cli-core';
+import { KinesisAnalyticsDefinition } from '../unsupported/cdk-from-cfn';
+
+export interface AppAnalyticsDefinitionFetcher {
+  getDefinition(): Promise<Record<string, KinesisAnalyticsDefinition> | undefined>;
+}
+
+export class AppAnalyticsDefinitionFetcher {
+  constructor(private backendEnvironmentResolver: BackendEnvironmentResolver, private stateManager: StateManager) {}
+
+  getDefinition = async (): Promise<Record<string, KinesisAnalyticsDefinition> | undefined> => {
+    const backendEnvironment = await this.backendEnvironmentResolver.selectBackendEnvironment();
+    assert(backendEnvironment?.stackName);
+
+    const meta = this.stateManager.getMeta();
+    const analytics = meta?.analytics as Record<string, KinesisAnalyticsDefinition> | undefined;
+    return analytics ?? undefined;
+  };
+}
diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/command-handlers.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/command-handlers.ts
index 0dbdaa2f3c..0b3caf5a2a 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/command-handlers.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/codegen-head/command-handlers.ts
@@ -31,6 +31,7 @@ import { AppFunctionsDefinitionFetcher } from './app_functions_definition_fetche
 import { printer } from './printer';
 import { format } from './format';
 import ora from 'ora';
+import { AppAnalyticsDefinitionFetcher } from './app_analytics_definition_fetcher';
 import * as ts from 'typescript';
 import { AmplifyHelperTransformer } from '../../../codegen-custom-resources/transformer/amplify-helper-transformer';
 import { DependencyMerger } from '../../../codegen-custom-resources/generator/dependency-merger';
@@ -44,12 +45,15 @@ interface CodegenCommandParameters {
   logger: Logger;
   outputDirectory: string;
   backendEnvironmentName: string | undefined;
+  rootStackName: string | undefined;
+  cloudFormationClient: CloudFormationClient;
   ccbFetcher: BackendDownloader;
   backendEnvironment: BackendEnvironment;
   dataDefinitionFetcher: DataDefinitionFetcher;
   authDefinitionFetcher: AppAuthDefinitionFetcher;
   storageDefinitionFetcher: AppStorageDefinitionFetcher;
   functionsDefinitionFetcher: AppFunctionsDefinitionFetcher;
+  analyticsDefinitionFetcher: AppAnalyticsDefinitionFetcher;
 }
 
 const TEMP_GEN_2_OUTPUT_DIR = 'amplify-gen2';
@@ -77,10 +81,13 @@ enum GEN2_AMPLIFY_GITIGNORE_FILES_OR_DIRS {
 const generateGen2Code = async ({
   outputDirectory,
   backendEnvironmentName,
+  rootStackName,
+  cloudFormationClient,
   authDefinitionFetcher,
   dataDefinitionFetcher,
   storageDefinitionFetcher,
   functionsDefinitionFetcher,
+  analyticsDefinitionFetcher,
   ccbFetcher,
   backendEnvironment,
   logger,
@@ -97,19 +104,26 @@ const generateGen2Code = async ({
   logger.info('Fetching definitions from AWS for category: Functions');
   const functions = await functionsDefinitionFetcher.getDefinition();
 
+  logger.info('Fetching definitions from AWS for category: Analytics');
+  const analytics = await analyticsDefinitionFetcher.getDefinition();
+
   logger.debug(`Auth: ${auth ? 'EXISTS' : 'UNDEFINED'}`);
   logger.debug(`Storage: ${storage ? 'EXISTS' : 'UNDEFINED'}`);
   logger.debug(`Data: ${data ? JSON.stringify(data, null, 2) : 'UNDEFINED'}`);
   logger.debug(`Functions: ${functions ? `${functions.length} functions` : 'UNDEFINED'}`);
   logger.debug(`Backend env: ${backendEnvironmentName}`);
+  logger.debug(`Analytics: ${analytics ? JSON.stringify(analytics, null, 2) : 'UNDEFINED'}`);
 
   const gen2RenderOptions: Gen2RenderingOptions = {
     outputDir: outputDirectory,
     backendEnvironmentName: backendEnvironmentName,
+    rootStackName: rootStackName,
+    cfnClient: cloudFormationClient,
     auth,
     storage,
     data,
     functions,
+    analytics,
     customResources: await getCustomResourceMap(ccbFetcher, backendEnvironment),
     unsupportedCategories: await unsupportedCategories(ccbFetcher, backendEnvironment),
   };
@@ -222,6 +236,7 @@ const unsupportedCategories = async (
   const unsupportedCategories = new Map<string, string>();
   const urlPrefix = 'https://docs.amplify.aws/react/build-a-backend/add-aws-services';
   const restAPIKey = 'rest api';
+  const analyticsKey = 'analytics';
 
   unsupportedCategories.set('geo', `${urlPrefix}/geo/`);
   unsupportedCategories.set('analytics', `${urlPrefix}/analytics/`);
@@ -240,10 +255,22 @@ const unsupportedCategories = async (
   const unsupportedCategoriesList = new Map<string, string>();
 
   categories.forEach((category) => {
-    if (unsupportedCategories.has(category) && Object.entries(meta[category]).length > 0) {
-      const unsupportedCategoryDocLink = unsupportedCategories.get(category);
-      assert(unsupportedCategoryDocLink);
-      unsupportedCategoriesList.set(category, unsupportedCategoryDocLink);
+    if (category === 'analytics') {
+      const analytics = meta?.analytics ?? {};
+      Object.keys(analytics).forEach((analytic) => {
+        const analyticObj = analytics[analytic];
+        if (analyticObj.service === 'Pinpoint') {
+          const analyticsDocLink = unsupportedCategories.get(analyticsKey);
+          assert(analyticsDocLink);
+          unsupportedCategoriesList.set(`Pinpoint ${analyticsKey}`, analyticsDocLink);
+        }
+      });
+    } else {
+      if (unsupportedCategories.has(category) && Object.entries(meta[category]).length > 0) {
+        const unsupportedCategoryDocLink = unsupportedCategories.get(category);
+        assert(unsupportedCategoryDocLink);
+        unsupportedCategoriesList.set(category, unsupportedCategoryDocLink);
+      }
     }
   });
 
@@ -534,11 +561,14 @@ export async function prepare(logger: Logger, appId: string, envName: string, re
       stateManager,
       ccbFetcher,
     ),
+    analyticsDefinitionFetcher: new AppAnalyticsDefinitionFetcher(backendEnvironmentResolver, stateManager),
     analytics: new AppAnalytics(appId),
     logger: logger,
     ccbFetcher,
     backendEnvironment,
     backendEnvironmentName: backendEnvironment.environmentName,
+    rootStackName: backendEnvironment.stackName,
+    cloudFormationClient: cloudFormationClient,
   });
 
   logger.info(`Creating 'amplify.yml' file for amplify hosting deployments`);
diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/core/migration-pipeline.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/core/migration-pipeline.ts
index 624e7472a0..d3a1f7f20e 100644
--- a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/core/migration-pipeline.ts
+++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/core/migration-pipeline.ts
@@ -61,6 +61,9 @@ import { DataDefinition, DataTableMapping, generateDataSource } from '../generat
 
 import { FunctionDefinition, renderFunctions } from '../generators/functions/index';
 import assert from 'assert';
+import { CdkFromCfn, KinesisAnalyticsDefinition, AnalyticsCodegenResult } from '../unsupported/cdk-from-cfn';
+import { renderAnalytics, AnalyticsRenderParameters } from '../generators/analytics/index';
+import { CloudFormationClient } from '@aws-sdk/client-cloudformation';
 
 /**
  * Configuration options for Gen 2 rendering pipeline
@@ -78,6 +81,12 @@ export interface Gen2RenderingOptions {
   /** Backend environment name used for data table mapping resolution */
   backendEnvironmentName?: string | undefined;
 
+  /** Root CloudFormation stack name for the Gen1 backend */
+  rootStackName?: string;
+
+  /** CloudFormation client for resolving stack parameters */
+  cfnClient?: CloudFormationClient;
+
   /** Authentication configuration from Gen 1 project */
   auth?: AuthDefinition;
 
@@ -90,6 +99,9 @@ export interface Gen2RenderingOptions {
   /** Lambda function definitions */
   functions?: FunctionDefinition[];
 
+  /** Analytics (Kinesis) definitions from Gen 1 project */
+  analytics?: Record<string, KinesisAnalyticsDefinition>;
+
   /** Custom CloudFormation resources that need manual migration */
   customResources?: Map<string, string>;
 
@@ -218,8 +230,11 @@ export const createGen2Renderer = ({
   storage,
   data,
   functions,
+  analytics,
   customResources,
   backendEnvironmentName,
+  rootStackName,
+  cfnClient,
   unsupportedCategories,
   fileWriter = (content, path) => createFileWriter(path)(content),
 }: Readonly<Gen2RenderingOptions>): Renderer => {
@@ -300,6 +315,48 @@ export const createGen2Renderer = ({
     backendRenderOptions.unsupportedCategories = unsupportedCategories;
   }
 
+  if (analytics) {
+    console.log('There are Analytics found in the Gen1 App');
+    const cdkFromCfn = new CdkFromCfn(outputDir, fileWriter, cfnClient, rootStackName);
+    const analyticsDir = path.join(outputDir, 'amplify', 'analytics');
+    renderers.push(new EnsureDirectory(analyticsDir));
+
+    // Process each analytics resource
+    for (const analyticName of Object.keys(analytics)) {
+      const analyticObj = analytics[analyticName];
+      analyticObj.name = analyticName;
+
+      if (analyticObj.service === 'Kinesis') {
+        console.log('Analytics backed by Kinesis found, generating L1 Code');
+
+        // Create a renderer that generates both the stack file and resource.ts
+        renderers.push(
+          new TypescriptNodeArrayRenderer(
+            async () => {
+              // Generate the stack file (e.g., todoprojectKinesis-stack.ts)
+              const codegenResult: AnalyticsCodegenResult = await cdkFromCfn.generateKinesisAnalyticsL1Code(analyticObj);
+
+              // Generate resource.ts using the analytics generator
+              const analyticsParams: AnalyticsRenderParameters = {
+                stackClassName: codegenResult.stackClassName,
+                stackFileName: codegenResult.stackFileName,
+                resourceName: codegenResult.resourceName,
+                shardCount: codegenResult.shardCount,
+              };
+
+              return renderAnalytics(analyticsParams);
+            },
+            (content) => fileWriter(content, path.join(analyticsDir, 'resource.ts')),
+          ),
+        );
+
+        backendRenderOptions.analytics = { importFrom: './analytics/resource' };
+      } else {
+        console.log('Analytics backed by Pinpoint found, still unsupported');
+      }
+    }
+  }
+
   // Process Lambda functions - create resource.ts and handler.ts files
   if (functions && functions.length) {
     const functionNamesAndCategory = new Map<string, string>();
diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/analytics/index.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/analytics/index.ts
new file mode 100644
index 0000000000..45ca39c25c
--- /dev/null
+++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/generators/analytics/index.ts
@@ -0,0 +1,179 @@
+import ts from 'typescript';
+import { newLineIdentifier } from '../../ts_factory_utils';
+
+const factory = ts.factory;
+
+/**
+ * Parameters for rendering analytics resource.ts file
+ */
+export interface AnalyticsRenderParameters {
+  /** The class name of the generated stack (e.g., 'analyticstodoprojectKinesis') */
+  stackClassName: string;
+  /** The file name of the generated stack without extension (e.g., 'todoprojectKinesis-stack') */
+  stackFileName: string;
+  /** The resource name used for stack ID and props (e.g., 'todoprojectKinesis') */
+  resourceName: string;
+  /** The number of shards for the Kinesis stream */
+  shardCount: number;
+}
+
+/**
+ * Renders the analytics resource.ts file that creates a NestedStack for Kinesis analytics.
+ *
+ * Generated output:
+ * ```typescript
+ * import { stackClassName } from './stackFileName';
+ * import { Backend } from '@aws-amplify/backend';
+ *
+ * export const analytics = (backend: Backend<any>) => {
+ *   const analyticsStack = backend.createStack('analytics');
+ *   new stackClassName(analyticsStack, 'resourceName', {
+ *     kinesisStreamName: 'resourceName',
+ *     kinesisStreamShardCount: shardCount,
+ *     authPolicyName: 'resourceName-auth-policy',
+ *     unauthPolicyName: 'resourceName-unauth-policy',
+ *     authRoleName: backend.auth.resources.authenticatedUserIamRole.roleName,
+ *     unauthRoleName: backend.auth.resources.unauthenticatedUserIamRole.roleName,
+ *     amplifyEnv: process.env.AWS_BRANCH ?? 'sandbox'
+ *   });
+ * };
+ * ```
+ */
+export const renderAnalytics = (params: AnalyticsRenderParameters): ts.NodeArray<ts.Node> => {
+  const { stackClassName, stackFileName, resourceName, shardCount } = params;
+
+  // Import statement: import { stackClassName } from './stackFileName';
+  const stackImport = factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(
+      false,
+      undefined,
+      factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier(stackClassName))]),
+    ),
+    factory.createStringLiteral(`./${stackFileName}`),
+  );
+
+  // Import Backend type: import { Backend } from '@aws-amplify/backend';
+  const backendImport = factory.createImportDeclaration(
+    undefined,
+    factory.createImportClause(
+      false,
+      undefined,
+      factory.createNamedImports([factory.createImportSpecifier(false, undefined, factory.createIdentifier('Backend'))]),
+    ),
+    factory.createStringLiteral('@aws-amplify/backend'),
+  );
+
+  // Create backend.createStack('analytics') call
+  const createStackCall = factory.createVariableStatement(
+    undefined,
+    factory.createVariableDeclarationList(
+      [
+        factory.createVariableDeclaration(
+          'analyticsStack',
+          undefined,
+          undefined,
+          factory.createCallExpression(
+            factory.createPropertyAccessExpression(factory.createIdentifier('backend'), factory.createIdentifier('createStack')),
+            undefined,
+            [factory.createStringLiteral('analytics')],
+          ),
+        ),
+      ],
+      ts.NodeFlags.Const,
+    ),
+  );
+
+  // Create property access for backend.auth.resources.authenticatedUserIamRole.roleName
+  const createAuthRoleAccess = () =>
+    factory.createPropertyAccessExpression(
+      factory.createPropertyAccessExpression(
+        factory.createPropertyAccessExpression(
+          factory.createPropertyAccessExpression(factory.createIdentifier('backend'), factory.createIdentifier('auth')),
+          factory.createIdentifier('resources'),
+        ),
+        factory.createIdentifier('authenticatedUserIamRole'),
+      ),
+      factory.createIdentifier('roleName'),
+    );
+
+  // Create property access for backend.auth.resources.unauthenticatedUserIamRole.roleName
+  const createUnauthRoleAccess = () =>
+    factory.createPropertyAccessExpression(
+      factory.createPropertyAccessExpression(
+        factory.createPropertyAccessExpression(
+          factory.createPropertyAccessExpression(factory.createIdentifier('backend'), factory.createIdentifier('auth')),
+          factory.createIdentifier('resources'),
+        ),
+        factory.createIdentifier('unauthenticatedUserIamRole'),
+      ),
+      factory.createIdentifier('roleName'),
+    );
+
+  // Create process.env.AWS_BRANCH ?? 'sandbox'
+  const createEnvExpression = () =>
+    factory.createBinaryExpression(
+      factory.createPropertyAccessExpression(
+        factory.createPropertyAccessExpression(factory.createIdentifier('process'), factory.createIdentifier('env')),
+        factory.createIdentifier('AWS_BRANCH'),
+      ),
+      factory.createToken(ts.SyntaxKind.QuestionQuestionToken),
+      factory.createStringLiteral('sandbox'),
+    );
+
+  // Create the new NestedStack instantiation with props
+  const newStackExpression = factory.createExpressionStatement(
+    factory.createNewExpression(factory.createIdentifier(stackClassName), undefined, [
+      factory.createIdentifier('analyticsStack'),
+      factory.createStringLiteral(resourceName),
+      factory.createObjectLiteralExpression(
+        [
+          factory.createPropertyAssignment(factory.createIdentifier('kinesisStreamName'), factory.createStringLiteral(resourceName)),
+          factory.createPropertyAssignment(factory.createIdentifier('kinesisStreamShardCount'), factory.createNumericLiteral(shardCount)),
+          factory.createPropertyAssignment(
+            factory.createIdentifier('authPolicyName'),
+            factory.createStringLiteral(`${resourceName}-auth-policy`),
+          ),
+          factory.createPropertyAssignment(
+            factory.createIdentifier('unauthPolicyName'),
+            factory.createStringLiteral(`${resourceName}-unauth-policy`),
+          ),
+          factory.createPropertyAssignment(factory.createIdentifier('authRoleName'), createAuthRoleAccess()),
+          factory.createPropertyAssignment(factory.createIdentifier('unauthRoleName'), createUnauthRoleAccess()),
+          factory.createPropertyAssignment(factory.createIdentifier('amplifyEnv'), createEnvExpression()),
+        ],
+        true,
+      ),
+    ]),
+  );
+
+  // Create the arrow function: export const analytics = (backend: Backend<any>) => { ... }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any -- Using 'any' for generated code to avoid complex type inference
+  const arrowFunction = factory.createArrowFunction(
+    undefined,
+    undefined,
+    [
+      factory.createParameterDeclaration(
+        undefined,
+        undefined,
+        factory.createIdentifier('backend'),
+        undefined,
+        factory.createTypeReferenceNode(factory.createIdentifier('Backend'), [factory.createKeywordTypeNode(ts.SyntaxKind.AnyKeyword)]),
+      ),
+    ],
+    undefined,
+    factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken),
+    factory.createBlock([createStackCall, newStackExpression], true),
+  );
+
+  // Export statement: export const analytics = ...
+  const exportStatement = factory.createVariableStatement(
+    [factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+    factory.createVariableDeclarationList(
+      [factory.createVariableDeclaration(factory.createIdentifier('analytics'), undefined, undefined, arrowFunction)],
+      ts.NodeFlags.Const,
+    ),
+  );
+
+  return factory.createNodeArray([stackImport, backendImport, newLineIdentifier, exportStatement]);
+};
diff --git a/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/unsupported/cdk-from-cfn.ts b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/unsupported/cdk-from-cfn.ts
new file mode 100644
index 0000000000..86924a12a4
--- /dev/null
+++ b/packages/amplify-cli/src/commands/gen2-migration/codegen-generate/src/unsupported/cdk-from-cfn.ts
@@ -0,0 +1,178 @@
+import * as path from 'path';
+import * as fs from 'fs/promises';
+import * as cdk_from_cfn from 'cdk-from-cfn';
+import { CFNTemplate } from '../../../refactor/types';
+import { GetObjectCommand, S3Client } from '@aws-sdk/client-s3';
+import { CloudFormationClient, DescribeStackResourcesCommand, DescribeStacksCommand, Parameter } from '@aws-sdk/client-cloudformation';
+import CFNConditionResolver from '../../../refactor/resolvers/cfn-condition-resolver';
+
+/**
+ * Definition for Kinesis Analytics resource from Gen1 amplify-meta.json
+ */
+export interface KinesisAnalyticsDefinition {
+  /** Resource name - set by migration-pipeline.ts from the analytics key */
+  name?: string;
+  /** Service type - Kinesis or Pinpoint */
+  service: 'Kinesis' | 'Pinpoint';
+  /** Provider metadata containing S3 template URL and logical ID */
+  providerMetadata: {
+    s3TemplateURL: string;
+    logicalId: string;
+  };
+}
+
+/**
+ * Result of analytics codegen containing metadata needed for resource.ts generation
+ */
+export interface AnalyticsCodegenResult {
+  /** The class name of the generated stack (extracted from generated code) */
+  stackClassName: string;
+  /** The file name of the generated stack without extension */
+  stackFileName: string;
+  /** The resource name used for stack ID and props */
+  resourceName: string;
+  /** The number of shards for the Kinesis stream */
+  shardCount: number;
+}
+
+export class CdkFromCfn {
+  public constructor(
+    private readonly dir: string,
+    private readonly fileWriter: (content: string, filePath: string) => Promise<void>,
+    private readonly cfnClient?: CloudFormationClient,
+    private readonly rootStackName?: string,
+  ) {}
+
+  /**
+   * Gets the parameters for a nested analytics stack by looking up its physical resource ID
+   * from the root stack and then describing that stack.
+   */
+  private async getAnalyticsStackParameters(logicalId: string): Promise<Parameter[]> {
+    if (!this.cfnClient || !this.rootStackName) {
+      return [];
+    }
+
+    try {
+      // Get the physical resource ID (actual stack name) from the root stack
+      const describeResourcesResponse = await this.cfnClient.send(
+        new DescribeStackResourcesCommand({
+          StackName: this.rootStackName,
+          LogicalResourceId: logicalId,
+        }),
+      );
+
+      const stackResource = describeResourcesResponse.StackResources?.[0];
+      if (!stackResource?.PhysicalResourceId) {
+        console.log(`Could not find physical resource ID for analytics stack: ${logicalId}`);
+        return [];
+      }
+
+      // Describe the nested stack to get its parameters
+      const describeStacksResponse = await this.cfnClient.send(
+        new DescribeStacksCommand({
+          StackName: stackResource.PhysicalResourceId,
+        }),
+      );
+
+      return describeStacksResponse.Stacks?.[0]?.Parameters ?? [];
+    } catch (error) {
+      console.log(`Error getting analytics stack parameters: ${error}`);
+      return [];
+    }
+  }
+
+  public async generateKinesisAnalyticsL1Code(definition: KinesisAnalyticsDefinition): Promise<AnalyticsCodegenResult> {
+    const resourceName = definition.name ?? 'kinesis';
+    const stackFileName = `${resourceName}-stack`;
+    const filePath = path.join(this.dir, 'amplify', 'analytics', `${stackFileName}.ts`);
+    const templateS3Url = definition.providerMetadata.s3TemplateURL;
+    const template = await getCfnTemplateFromS3(templateS3Url);
+    const stackName = definition.providerMetadata.logicalId;
+
+    // Get shardCount from deployed stack parameters
+    const parameters = await this.getAnalyticsStackParameters(stackName);
+    const shardCountParam = parameters.find((p) => p.ParameterKey === 'kinesisStreamShardCount');
+    if (!shardCountParam?.ParameterValue) {
+      throw new Error(`kinesisStreamShardCount parameter not found for stack ${stackName}`);
+    }
+    const shardCount = parseInt(shardCountParam.ParameterValue, 10);
+
+    const finalTemplate = await this.preTransmute(template, stackName);
+    const tsFile = cdk_from_cfn.transmute(JSON.stringify(finalTemplate), 'typescript', stackName);
+    await fs.mkdir(path.dirname(filePath), { recursive: true });
+    await this.fileWriter(tsFile, filePath);
+
+    // Extract the class name from the generated code
+    const classNameMatch = tsFile.match(/export class (\w+) extends/);
+    const stackClassName = classNameMatch ? classNameMatch[1] : `analytics${resourceName}`;
+
+    return {
+      stackClassName,
+      stackFileName,
+      resourceName,
+      shardCount,
+    };
+  }
+
+  private async preTransmute(template: CFNTemplate, logicalId: string): Promise<CFNTemplate> {
+    // Rename "env" parameter to "amplify-env"
+    if (template.Parameters?.env) {
+      template.Parameters['amplify-env'] = template.Parameters.env;
+      delete template.Parameters.env;
+    }
+
+    // Update all Ref references from "env" to "amplify-env"
+    const updateRefs = (obj: unknown): void => {
+      if (typeof obj === 'object' && obj !== null) {
+        const record = obj as Record<string, unknown>;
+        if (record.Ref === 'env') {
+          record.Ref = 'amplify-env';
+        }
+        Object.values(record).forEach(updateRefs);
+      }
+    };
+
+    updateRefs(template.Resources);
+
+    // Resolve CFN conditions using deployed stack parameters
+    // This is critical because cdk-from-cfn generates broken TypeScript for CFN conditions
+    // (e.g., `const shouldNotCreateEnvResources = props.env! === 'NONE';` which is invalid syntax)
+    const parameters = await this.getAnalyticsStackParameters(logicalId);
+    if (parameters.length > 0) {
+      const resolved = new CFNConditionResolver(template).resolve(parameters);
+      // Delete the Conditions block after resolution - cdk-from-cfn generates broken code for conditions
+      // All Fn::If references have been resolved, and resources with unmet conditions have been removed
+      delete resolved.Conditions;
+      return resolved;
+    }
+
+    return template;
+  }
+}
+
+async function getCfnTemplateFromS3(s3Url: string): Promise<CFNTemplate> {
+  const url = new URL(s3Url);
+  let bucket: string;
+  let key: string;
+
+  // Check if virtual-hosted style (bucket in hostname)
+  // e.g., https://my-bucket.s3.us-east-1.amazonaws.com/key/path
+  const virtualHostMatch = url.hostname.match(/^(.+)\.s3[.-].*\.amazonaws\.com$/);
+
+  if (virtualHostMatch) {
+    bucket = virtualHostMatch[1];
+    key = url.pathname.slice(1); // remove leading '/'
+  } else {
+    // Path-style: https://s3.region.amazonaws.com/bucket/key/path
+    const splitPath = url.pathname.split('/');
+    bucket = splitPath[1];
+    key = splitPath.slice(2).join('/');
+  }
+
+  const s3Client = new S3Client({});
+  const response = await s3Client.send(new GetObjectCommand({ Bucket: bucket, Key: key }));
+  if (!response.Body) {
+    throw new Error(`Failed to retrieve S3 object: ${s3Url}`);
+  }
+  return JSON.parse(await response.Body.transformToString()) as CFNTemplate;
+}
diff --git a/yarn.lock b/yarn.lock
index 4dfbd38857..2851dd947d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1270,6 +1270,7 @@ __metadata:
     amplify-python-function-runtime-provider: 2.4.54
     aws-cdk-lib: ~2.189.1
     bottleneck: 2.19.5
+    cdk-from-cfn: ^0.263.0
     chalk: ^4.1.1
     ci-info: ^3.8.0
     cli-table3: ^0.6.0
@@ -2725,7 +2726,6 @@ __metadata:
     "@smithy/util-retry": ^4
     "@smithy/util-waiter": ^4
     archiver: ^7.0.1
-    cdk-from-cfn: ^0.236.0
     chalk: ^4
     chokidar: ^3
     fs-extra: ^9
@@ -21256,10 +21256,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cdk-from-cfn@npm:^0.236.0":
-  version: 0.236.0
-  resolution: "cdk-from-cfn@npm:0.236.0"
-  checksum: 5603d74e4ac1dcb217d93d9860a50a519a32502bc180f6a6b0023220578f52236cdfe4fe85da6d0950de7df7bf2f6f811e50ad386b38fe901ff1a3dadf977a99
+"cdk-from-cfn@npm:^0.263.0":
+  version: 0.263.0
+  resolution: "cdk-from-cfn@npm:0.263.0"
+  checksum: db4c153128427e44d9a38faa75b8eb5c9ac73b7509a0b774c4e82c0a977430a1dafab7e352977cc8f63d58dac2c4586bd0650dd66030bb2ef42315c3e303aec3
   languageName: node
   linkType: hard