@automattic/jetpack-ai-client 0.32.1 → 0.33.0

package/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.33.0] - 2025-06-30
+### Changed
+- Create custom explat client with public-api fetch for assignments. [#44081]
+
 ## [0.32.1] - 2025-06-24
 ### Added
 - Improve error handling on Chrome AI events. [#44048]
@@ -650,6 +654,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - AI Client: stop using smart document visibility handling on the fetchEventSource library, so it does not restart the completion when changing tabs. [#32004]
 - Updated package dependencies. [#31468] [#31659] [#31785]
 
+[0.33.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.32.1...v0.33.0
 [0.32.1]: https://github.com/Automattic/jetpack-ai-client/compare/v0.32.0...v0.32.1
 [0.32.0]: https://github.com/Automattic/jetpack-ai-client/compare/v0.31.2...v0.32.0
 [0.31.2]: https://github.com/Automattic/jetpack-ai-client/compare/v0.31.1...v0.31.2

package/build/api-fetch/index.d.ts

@@ -2,7 +2,15 @@
  * External dependencies
  */
 import apiFetchMod from '@wordpress/api-fetch';
+/**
+ * Types
+ */
+import type { APIFetchOptions } from '@wordpress/api-fetch';
 declare const apiFetch: typeof apiFetchMod.default;
 type ApiFetchType = typeof apiFetch extends Function ? typeof apiFetch : typeof apiFetchMod;
-declare const _default: ApiFetchType;
+type AugmentedAPIFetchOptions = APIFetchOptions & {
+    global?: boolean;
+};
+type AugmentedApiFetchType = (options: AugmentedAPIFetchOptions) => ReturnType<ApiFetchType>;
+declare const _default: AugmentedApiFetchType;
 export default _default;

package/build/chrome-ai/get-availability.js

@@ -1,9 +1,14 @@
 /**
  * External dependencies
  */
-import { initializeExPlat, loadExperimentAssignmentWithAuth } from '@automattic/jetpack-explat';
+import { initializeExPlat, createExPlatClient } from '@automattic/jetpack-explat';
 import { select } from '@wordpress/data';
+import { addQueryArgs } from '@wordpress/url';
 import debugFactory from 'debug';
+/**
+ * Internal dependencies
+ */
+import apiFetch from "../api-fetch/index.js";
 const debug = debugFactory('ai-client:chrome-ai-availability');
 /**
  * Get the AI Assistant feature.
@@ -14,6 +19,28 @@ function getAiAssistantFeature() {
     const { getAiAssistantFeature: getFeature } = select('wordpress-com/plans');
     return getFeature();
 }
+/**
+ * Fetch an experiment assignment.
+ *
+ * @param {boolean} asConnectedUser - Whether the user is connected.
+ * @return {Function} A function that fetches an experiment assignment.
+ */
+const fetchExperimentAssignmentWithConnectedUser = async ({ experimentName, }) => {
+    const params = {
+        experiment_name: experimentName,
+        anon_id: undefined,
+        as_connected_user: true,
+    };
+    debug('params', params);
+    const assignmentsRequestUrl = addQueryArgs('https://public-api.wordpress.com/wpcom/v2/experiments/0.1.0/assignments/jetpack', params);
+    debug('assignmentsRequestUrl', assignmentsRequestUrl);
+    return apiFetch({
+        url: assignmentsRequestUrl,
+        credentials: 'include',
+        mode: 'cors',
+        global: true,
+    });
+};
 /**
  * Check if Chrome AI can be enabled.
  *
@@ -27,7 +54,12 @@ export async function isChromeAIAvailable() {
         return false;
     }
     initializeExPlat();
-    debug('initialized explat');
+    const { loadExperimentAssignment: loadExperimentAssignmentWithAuth } = createExPlatClient({
+        fetchExperimentAssignment: fetchExperimentAssignmentWithConnectedUser,
+        getAnonId: async () => null,
+        logError: debug,
+        isDevelopmentMode: false,
+    });
     const { variationName } = await loadExperimentAssignmentWithAuth('calypso_jetpack_ai_gemini_api_202503_v1');
     debug('variationName', variationName);
     return variationName === 'treatment';

package/build/jwt/index.js

@@ -39,7 +39,7 @@ export default async function requestJwt({ apiNonce, siteId, expirationTime, } =
     let data;
     const isSimple = isSimpleSite();
     if (!isSimple) {
-        data = await apiFetch({
+        data = (await apiFetch({
             /*
              * This endpoint is registered in the Jetpack plugin.
              * Provably we should move it to another package, but for now it's here.
@@ -51,13 +51,13 @@ export default async function requestJwt({ apiNonce, siteId, expirationTime, } =
                 'X-WP-Nonce': apiNonce,
             },
             method: 'POST',
-        });
+        }));
     }
     else {
-        data = await apiFetch({
+        data = (await apiFetch({
             path: '/wpcom/v2/sites/' + siteId + '/jetpack-openai-query/jwt',
             method: 'POST',
-        });
+        }));
     }
     const newTokenData = {
         token: data.token,

package/package.json

@@ -1,7 +1,7 @@
 {
 	"private": false,
 	"name": "@automattic/jetpack-ai-client",
-	"version": "0.32.1",
+	"version": "0.33.0",
 	"description": "A JS client for consuming Jetpack AI services",
 	"homepage": "https://github.com/Automattic/jetpack/tree/HEAD/projects/js-packages/ai-client/#readme",
 	"bugs": {
@@ -46,11 +46,11 @@
 	"types": "./build/index.d.ts",
 	"dependencies": {
 		"@automattic/jetpack-base-styles": "^1.0.1",
-		"@automattic/jetpack-components": "^1.1.6",
-		"@automattic/jetpack-connection": "^1.2.6",
+		"@automattic/jetpack-components": "^1.1.7",
+		"@automattic/jetpack-connection": "^1.2.7",
 		"@automattic/jetpack-script-data": "^0.4.4",
 		"@automattic/jetpack-explat": "workspace:*",
-		"@automattic/jetpack-shared-extension-utils": "^1.2.1",
+		"@automattic/jetpack-shared-extension-utils": "^1.2.2",
 		"@microsoft/fetch-event-source": "2.0.1",
 		"@types/jest": "30.0.0",
 		"@types/react": "18.3.23",

package/src/api-fetch/index.ts

@@ -2,6 +2,10 @@
  * External dependencies
  */
 import apiFetchMod from '@wordpress/api-fetch';
+/**
+ * Types
+ */
+import type { APIFetchOptions } from '@wordpress/api-fetch';
 
 // @wordpress/api-fetch (as of 6.47.0) declares itself in such a way that tsc and node see the function at apiFetchMod.default
 // while some other environments (including code running inside WordPress itself) see it at apiFetch.
@@ -11,4 +15,10 @@ const apiFetch = 'default' in apiFetchMod ? apiFetchMod.default : apiFetchMod;
 // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
 type ApiFetchType = typeof apiFetch extends Function ? typeof apiFetch : typeof apiFetchMod;
 
-export default apiFetch as ApiFetchType;
+type AugmentedAPIFetchOptions = APIFetchOptions & {
+	global?: boolean;
+};
+
+type AugmentedApiFetchType = ( options: AugmentedAPIFetchOptions ) => ReturnType< ApiFetchType >;
+
+export default apiFetch as AugmentedApiFetchType;

package/src/chrome-ai/get-availability.ts

@@ -1,11 +1,14 @@
 /**
  * External dependencies
  */
-import { initializeExPlat, loadExperimentAssignmentWithAuth } from '@automattic/jetpack-explat';
+import { initializeExPlat, createExPlatClient } from '@automattic/jetpack-explat';
 import { select } from '@wordpress/data';
+import { addQueryArgs } from '@wordpress/url';
 import debugFactory from 'debug';
-
-const debug = debugFactory( 'ai-client:chrome-ai-availability' );
+/**
+ * Internal dependencies
+ */
+import apiFetch from '../api-fetch/index.ts';
 
 /**
  * Types
@@ -21,6 +24,8 @@ type PlansSelect = {
 	};
 };
 
+const debug = debugFactory( 'ai-client:chrome-ai-availability' );
+
 /**
  * Get the AI Assistant feature.
  *
@@ -31,6 +36,40 @@ function getAiAssistantFeature() {
 	return getFeature();
 }
 
+/**
+ * Fetch an experiment assignment.
+ *
+ * @param {boolean} asConnectedUser - Whether the user is connected.
+ * @return {Function} A function that fetches an experiment assignment.
+ */
+const fetchExperimentAssignmentWithConnectedUser = async ( {
+	experimentName,
+}: {
+	experimentName: string;
+} ): Promise< unknown > => {
+	const params = {
+		experiment_name: experimentName,
+		anon_id: undefined,
+		as_connected_user: true,
+	};
+
+	debug( 'params', params );
+
+	const assignmentsRequestUrl = addQueryArgs(
+		'https://public-api.wordpress.com/wpcom/v2/experiments/0.1.0/assignments/jetpack',
+		params
+	);
+
+	debug( 'assignmentsRequestUrl', assignmentsRequestUrl );
+
+	return apiFetch( {
+		url: assignmentsRequestUrl,
+		credentials: 'include',
+		mode: 'cors',
+		global: true,
+	} );
+};
+
 /**
  * Check if Chrome AI can be enabled.
  *
@@ -46,7 +85,13 @@ export async function isChromeAIAvailable() {
 	}
 
 	initializeExPlat();
-	debug( 'initialized explat' );
+
+	const { loadExperimentAssignment: loadExperimentAssignmentWithAuth } = createExPlatClient( {
+		fetchExperimentAssignment: fetchExperimentAssignmentWithConnectedUser,
+		getAnonId: async () => null,
+		logError: debug,
+		isDevelopmentMode: false,
+	} );
 
 	const { variationName } = await loadExperimentAssignmentWithAuth(
 		'calypso_jetpack_ai_gemini_api_202503_v1'

package/src/jwt/index.ts

@@ -70,7 +70,7 @@ export default async function requestJwt( {
 
 	const isSimple = isSimpleSite();
 	if ( ! isSimple ) {
-		data = await apiFetch( {
+		data = ( await apiFetch( {
 			/*
 			 * This endpoint is registered in the Jetpack plugin.
 			 * Provably we should move it to another package, but for now it's here.
@@ -82,12 +82,12 @@ export default async function requestJwt( {
 				'X-WP-Nonce': apiNonce,
 			},
 			method: 'POST',
-		} );
+		} ) ) as TokenDataEndpointResponseProps;
 	} else {
-		data = await apiFetch( {
+		data = ( await apiFetch( {
 			path: '/wpcom/v2/sites/' + siteId + '/jetpack-openai-query/jwt',
 			method: 'POST',
-		} );
+		} ) ) as TokenDataEndpointResponseProps;
 	}
 
 	const newTokenData = {

package/src/logo-generator/lib/wpcom-limited-request.ts

@@ -24,7 +24,7 @@ export default async function wpcomLimitedRequest< T >( params: object ): Promis
 		throw new Error( 'Too many requests' );
 	}
 
-	return apiFetch< T >( params ).finally( () => {
+	return apiFetch( params ).finally( () => {
 		concurrentCounter -= 1;
-	} );
+	} ) as Promise< T >;
 }