@atlaskit/editor-plugin-autocomplete 4.1.0 → 4.1.2

package/dist/esm/pm-plugins/text-predictor.js

@@ -5,6 +5,8 @@ import _createClass from "@babel/runtime/helpers/createClass";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t.return || t.return(); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
@@ -732,7 +734,7 @@ function unwrapJsonModule(mod, shape) {
 export var loadVectorsAsync = /*#__PURE__*/function () {
   var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(options) {
     var _options$isLocalLLM;
-    var isLocalLLM, url, _wordIndexOuter$index, res, buffer, float32, wordIndexModule, wordIndexOuter, wordIndex, nWords, dim, _t, _t2;
+    var isLocalLLM, surface, url, _wordIndexOuter$index, res, buffer, float32, wordIndexModule, wordIndexOuter, wordIndex, nWords, dim, _t, _t2;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -751,10 +753,13 @@ export var loadVectorsAsync = /*#__PURE__*/function () {
           return _context.abrupt("return");
         case 2:
           isLocalLLM = (_options$isLocalLLM = options === null || options === void 0 ? void 0 : options.isLocalLLM) !== null && _options$isLocalLLM !== void 0 ? _options$isLocalLLM : false;
+          surface = options === null || options === void 0 ? void 0 : options.surface;
           vectorsLoadStarted = true;
-          startExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+          startExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           _context.prev = 3;
           _context.next = 4;
           return options.getBinaryUrl();
@@ -766,10 +771,12 @@ export var loadVectorsAsync = /*#__PURE__*/function () {
           _context.prev = 5;
           _t = _context["catch"](3);
           vectorsLoadStarted = false;
-          failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+          failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM,
             errorType: 'resolve_url'
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           // eslint-disable-next-line no-console
           console.warn('[text-predictor] Failed to resolve vectors URL:', _t);
           return _context.abrupt("return");
@@ -784,11 +791,13 @@ export var loadVectorsAsync = /*#__PURE__*/function () {
             break;
           }
           vectorsLoadStarted = false;
-          failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+          failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM,
             status: res.status,
             errorType: 'http_error'
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           // eslint-disable-next-line no-console
           console.warn("[text-predictor] Failed to load vectors: ".concat(res.status));
           return _context.abrupt("return");
@@ -817,12 +826,14 @@ export var loadVectorsAsync = /*#__PURE__*/function () {
             wordIndex: wordIndex,
             dim: dim
           };
-          succeedExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+          succeedExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM,
             wordCount: nWords,
             dim: dim,
             sizeBytes: float32.byteLength
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           if (isAutocompleteDebugEnabled()) {
             // eslint-disable-next-line no-console
             console.log('[text-predictor] Vectors loaded:', {
@@ -837,10 +848,12 @@ export var loadVectorsAsync = /*#__PURE__*/function () {
           _context.prev = 11;
           _t2 = _context["catch"](6);
           vectorsLoadStarted = false;
-          failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+          failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM,
             errorType: 'network'
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           // eslint-disable-next-line no-console
           console.warn('[text-predictor] Failed to load vectors:', _t2);
         case 12:
@@ -866,14 +879,17 @@ export var loadDefaultVocabulary = function loadDefaultVocabulary(options) {
     return vocabularyLoadPromise;
   }
   var isLocalLLM = (_options$isLocalLLM2 = options === null || options === void 0 ? void 0 : options.isLocalLLM) !== null && _options$isLocalLLM2 !== void 0 ? _options$isLocalLLM2 : false;
+  var surface = options === null || options === void 0 ? void 0 : options.surface;
   vocabularyLoadPromise = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var _yield$Promise$all, _yield$Promise$all2, vocabularyModule, l3VocabularyModule, vocabularyData, l3VocabularyData, terms, _t3;
     return _regeneratorRuntime.wrap(function (_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          startExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', {
+          startExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           _context2.prev = 1;
           _context2.next = 2;
           return Promise.all([import( /* webpackChunkName: "@atlaskit-internal_editor-plugin-autocomplete-vocabulary-10k" */'./data/vocabulary_10k.json'), import( /* webpackChunkName: "@atlaskit-internal_editor-plugin-autocomplete-l3-vocabulary" */'./data/l3_vocabulary.json')]);
@@ -907,20 +923,24 @@ export var loadDefaultVocabulary = function loadDefaultVocabulary(options) {
           initVocabulary({
             terms: terms
           });
-          succeedExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', {
+          succeedExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM,
             l2WordCount: terms.length,
             l3WordCount: l3VocabularyData.length
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           _context2.next = 5;
           break;
         case 4:
           _context2.prev = 4;
           _t3 = _context2["catch"](1);
-          failExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', {
+          failExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', _objectSpread({
             isLocalLLM: isLocalLLM,
             errorType: 'parse_error'
-          });
+          }, surface ? {
+            surface: surface
+          } : {}));
           // Allow a later call to retry the load rather than caching the failure.
           vocabularyLoadPromise = undefined;
           throw _t3;

package/dist/types/pm-plugins/autocomplete-plugin.d.ts

@@ -29,6 +29,11 @@ export interface AutocompleteContext {
     siblingCommentsContents?: string[];
 }
 export interface AutocompletePluginOptions {
+    /**
+     * Product/editor surface where autocomplete runs (e.g. "comment", "chat").
+     * Added to analytics and UFO metadata for cross-surface reporting.
+     */
+    surface?: string;
     /**
      * Async function called once on first editor focus to retrieve context for
      * word-frequency boosting. Called lazily so the preset can remain synchronous.

package/dist/types/pm-plugins/local-slow-lane-client.d.ts

@@ -72,6 +72,8 @@ export interface LocalSlowLaneClientConfig {
         hasVector: boolean;
         textLength: number;
     }) => void;
+    /** Product/editor surface where autocomplete runs. */
+    surface?: string;
 }
 export interface LocalSlowLaneClient {
     /** Clean up resources. */

package/dist/types/pm-plugins/slow-lane-client.d.ts

@@ -32,6 +32,7 @@ export interface SlowLaneClientConfig {
     }) => void;
     productKey?: string;
     sessionId?: string;
+    surface?: string;
 }
 export declare const createSlowLaneClient: (config: SlowLaneClientConfig) => {
     getContextVector: () => Float32Array | null;

package/dist/types/pm-plugins/text-predictor.d.ts

@@ -83,9 +83,11 @@ export declare const predict: (textBefore: string) => string | null;
 export declare const loadVectorsAsync: (options?: {
     getBinaryUrl?: () => Promise<string>;
     isLocalLLM?: boolean;
+    surface?: string;
 }) => Promise<void>;
 export declare const initVectors: (store: VectorStore) => void;
 export declare const loadDefaultVocabulary: (options?: {
     isLocalLLM?: boolean;
+    surface?: string;
 }) => Promise<void>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-autocomplete",
-	"version": "4.1.0",
+	"version": "4.1.2",
 	"description": "Client-side text autocomplete plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -8,7 +8,7 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"scripts": {
-		"ak-postbuild": "ls -d dist/* | grep -v dist/types | xargs -n 1 copyfiles -u 1 -V 'src/pm-plugins/data/*.json'"
+		"ak-postbuild": "ls -d dist/* | xargs -n 1 copyfiles -u 1 -V src/pm-plugins/data/*.json"
 	},
 	"atlassian": {
 		"team": "Editor: AI",
@@ -30,15 +30,21 @@
 		"wink-nlp": "^2.4.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^116.24.0",
+		"@atlaskit/editor-common": "^116.30.0",
 		"@atlaskit/editor-plugin-analytics": "^12.0.0",
 		"react": "^18.2.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {
-			"code-structure": ["editor-plugin"],
-			"import-structure": ["atlassian-conventions"],
-			"circular-dependencies": ["file-and-folder-level"]
+			"code-structure": [
+				"editor-plugin"
+			],
+			"import-structure": [
+				"atlassian-conventions"
+			],
+			"circular-dependencies": [
+				"file-and-folder-level"
+			]
 		}
 	},
 	"devDependencies": {

package/src/pm-plugins/autocomplete-plugin.ts

@@ -208,6 +208,11 @@ export interface AutocompleteContext {
 }
 
 export interface AutocompletePluginOptions {
+	/**
+	 * Product/editor surface where autocomplete runs (e.g. "comment", "chat").
+	 * Added to analytics and UFO metadata for cross-surface reporting.
+	 */
+	surface?: string;
 	/**
 	 * Async function called once on first editor focus to retrieve context for
 	 * word-frequency boosting. Called lazily so the preset can remain synchronous.
@@ -328,6 +333,7 @@ export const createAutocompletePlugin = (
 	options?: AutocompletePluginOptions,
 	api?: ExtractInjectionAPI<AutocompletePlugin>,
 ): SafePlugin<AutocompletePluginState> => {
+	const surface = options?.surface ?? 'editor';
 	const locale =
 		options?.locale ?? (typeof navigator !== 'undefined' ? navigator.language : undefined);
 	const isAutocompleteEnabled = isEnglishLocale(locale);
@@ -375,7 +381,7 @@ export const createAutocompletePlugin = (
 			action: ACTION.SUGGESTION_DISMISSED,
 			actionSubject: ACTION_SUBJECT.CONTEXTUAL_TYPEAHEAD,
 			eventType: EVENT_TYPE.TRACK,
-			attributes: { completionSource: getCompletionSource(), reason },
+			attributes: { completionSource: getCompletionSource(), reason, surface },
 		});
 	};
 
@@ -390,6 +396,7 @@ export const createAutocompletePlugin = (
 				loadDurationMs: info.loadDurationMs,
 				gpuVendor: info.capabilities.vendor,
 				gpuArchitecture: info.capabilities.architecture,
+				surface,
 			},
 		});
 	};
@@ -412,6 +419,7 @@ export const createAutocompletePlugin = (
 				maxStorageBufferBindingSizeMB: capabilities.maxStorageBufferBindingSizeMB,
 				gpuVendor: capabilities.vendor,
 				gpuArchitecture: capabilities.architecture,
+				surface,
 			},
 		});
 	};
@@ -430,6 +438,7 @@ export const createAutocompletePlugin = (
 				suggestionLength,
 				typedLength,
 				kssDelta,
+				surface,
 			},
 		});
 	};
@@ -439,10 +448,12 @@ export const createAutocompletePlugin = (
 				debounceMs: LOCAL_SLOW_LANE_DEBOUNCE_MS,
 				onLoadSuccess: fireLocalModelLoadedAnalytics,
 				onLoadError: fireLocalModelLoadFailedAnalytics,
+				surface,
 			})
 		: createSlowLaneClient({
 				baseUrl: '',
 				debounceMs: NETWORK_SLOW_LANE_DEBOUNCE_MS,
+				surface,
 			});
 	setDefaultSlowLaneClient(slowLaneClient);
 
@@ -632,7 +643,7 @@ export const createAutocompletePlugin = (
 							action: ACTION.SUGGESTION_VIEWED,
 							actionSubject: ACTION_SUBJECT.CONTEXTUAL_TYPEAHEAD,
 							eventType: EVENT_TYPE.TRACK,
-							attributes: { completionSource: getCompletionSource() },
+							attributes: { completionSource: getCompletionSource(), surface },
 						});
 					}
 				}
@@ -778,7 +789,10 @@ export const createAutocompletePlugin = (
 						return false;
 					}
 
-					loadDefaultVocabulary({ isLocalLLM: options?.useLocalModel ?? false }).catch((error) => {
+					loadDefaultVocabulary({
+						isLocalLLM: options?.useLocalModel ?? false,
+						surface,
+					}).catch((error) => {
 						logException(error as Error, {
 							location: 'editor-plugin-autocomplete/loadDefaultVocabulary',
 						});
@@ -786,6 +800,7 @@ export const createAutocompletePlugin = (
 					loadVectorsAsync({
 						getBinaryUrl: options?.getVectorsBinaryUrl,
 						isLocalLLM: options?.useLocalModel ?? false,
+						surface,
 					}).catch((error) => {
 						logException(error as Error, {
 							location: 'editor-plugin-autocomplete/loadVectorsAsync',

package/src/pm-plugins/local-slow-lane-client.ts

@@ -81,6 +81,8 @@ export interface LocalSlowLaneClientConfig {
 	onStatus?: (message: string) => void;
 	/** Callback fired when inference returns new results. */
 	onUpdate?: (opts: { hasLmLogits: boolean; hasVector: boolean; textLength: number }) => void;
+	/** Product/editor surface where autocomplete runs. */
+	surface?: string;
 }
 
 // Same return type as createSlowLaneClient for drop-in compatibility
@@ -664,6 +666,7 @@ export const createLocalSlowLaneClient = (
 		onLoadSuccess,
 		modelId = LOCAL_MLC_CAUSAL_MODEL_ID,
 		customModelConfig,
+		surface,
 	} = config;
 
 	// ── State ──────────────────────────────────────────────────────────────
@@ -739,7 +742,9 @@ export const createLocalSlowLaneClient = (
 			let vendor: string | undefined;
 			let architecture: string | undefined;
 			try {
-				const info = adapter.info ?? (await adapter.requestAdapterInfo?.());
+				const info =
+					(adapter as MinimalGpuAdapter).info ??
+					(await (adapter as MinimalGpuAdapter).requestAdapterInfo?.());
 				vendor = info?.vendor || undefined;
 				architecture = info?.architecture || undefined;
 			} catch {
@@ -1040,6 +1045,7 @@ export const createLocalSlowLaneClient = (
 			startExp(EXPERIENCE_NAME.SLOW_LANE_FETCH, experienceId, {
 				textLength: text.length,
 				isLocalLLM: true,
+				...(surface ? { surface } : {}),
 			});
 
 			const tStart = performance.now();
@@ -1085,7 +1091,7 @@ export const createLocalSlowLaneClient = (
 					EXPERIENCE_NAME.SLOW_LANE_FETCH,
 					experienceId,
 					destroyed ? 'destroyed' : 'superseded',
-					{ isLocalLLM: true },
+					{ isLocalLLM: true, ...(surface ? { surface } : {}) },
 				);
 				return;
 			}
@@ -1154,6 +1160,7 @@ export const createLocalSlowLaneClient = (
 				hasVector: storedContextVector !== null,
 				hasLmLogits: storedLmLogits !== null,
 				isLocalLLM: true,
+				...(surface ? { surface } : {}),
 			});
 
 			onUpdate?.({
@@ -1168,7 +1175,7 @@ export const createLocalSlowLaneClient = (
 					EXPERIENCE_NAME.SLOW_LANE_FETCH,
 					experienceId,
 					destroyed ? 'destroyed' : 'superseded',
-					{ isLocalLLM: true },
+					{ isLocalLLM: true, ...(surface ? { surface } : {}) },
 				);
 				return;
 			}
@@ -1178,6 +1185,7 @@ export const createLocalSlowLaneClient = (
 			failExp(EXPERIENCE_NAME.SLOW_LANE_FETCH, experienceId, {
 				errorType: 'inference',
 				isLocalLLM: true,
+				...(surface ? { surface } : {}),
 			});
 			onUpdate?.({ textLength: text.length, hasVector: false, hasLmLogits: false });
 

package/src/pm-plugins/slow-lane-client.ts

@@ -54,6 +54,7 @@ export interface SlowLaneClientConfig {
 	onUpdate?: (opts: { hasLmLogits: boolean; hasVector: boolean; textLength: number }) => void;
 	productKey?: string;
 	sessionId?: string;
+	surface?: string;
 }
 
 export const createSlowLaneClient = (
@@ -70,6 +71,7 @@ export const createSlowLaneClient = (
 		baseUrl,
 		sessionId: configSessionId,
 		productKey = 'confluence',
+		surface,
 		endpoint = '/gateway/api/v1/autocomplete/typeahead-encodings',
 		debounceMs = DEFAULT_DEBOUNCE_MS,
 		fetchFn = fetch,
@@ -105,6 +107,7 @@ export const createSlowLaneClient = (
 		startExp(EXPERIENCE_NAME.SLOW_LANE_FETCH, requestId, {
 			textLength: text.length,
 			isLocalLLM: false,
+			...(surface ? { surface } : {}),
 		});
 
 		if (isAutocompleteDebugEnabled()) {
@@ -136,6 +139,7 @@ export const createSlowLaneClient = (
 					status: res.status,
 					errorType: 'http_error',
 					isLocalLLM: false,
+					...(surface ? { surface } : {}),
 				});
 				if (isAutocompleteDebugEnabled()) {
 					// eslint-disable-next-line no-console
@@ -190,6 +194,7 @@ export const createSlowLaneClient = (
 				hasVector: storedContextVector !== null,
 				hasLmLogits: storedLmLogits !== null,
 				isLocalLLM: false,
+				...(surface ? { surface } : {}),
 			});
 
 			onUpdate?.({
@@ -204,6 +209,7 @@ export const createSlowLaneClient = (
 			failExp(EXPERIENCE_NAME.SLOW_LANE_FETCH, requestId, {
 				errorType: 'network',
 				isLocalLLM: false,
+				...(surface ? { surface } : {}),
 			});
 			if (isAutocompleteDebugEnabled()) {
 				// eslint-disable-next-line no-console
@@ -230,6 +236,7 @@ export const createSlowLaneClient = (
 			if (inflightRequestId !== null) {
 				abortExp(EXPERIENCE_NAME.SLOW_LANE_FETCH, inflightRequestId, 'superseded', {
 					isLocalLLM: false,
+					...(surface ? { surface } : {}),
 				});
 			}
 			const requestId = String(++requestSeq);

package/src/pm-plugins/text-predictor.ts

@@ -751,6 +751,7 @@ function unwrapJsonModule<T>(mod: unknown, shape: 'object' | 'array'): T | null
 export const loadVectorsAsync = async (options?: {
 	getBinaryUrl?: () => Promise<string>;
 	isLocalLLM?: boolean;
+	surface?: string;
 }): Promise<void> => {
 	if (vectorStore || vectorsLoadStarted) {
 		return;
@@ -763,15 +764,23 @@ export const loadVectorsAsync = async (options?: {
 		return;
 	}
 	const isLocalLLM = options?.isLocalLLM ?? false;
+	const surface = options?.surface;
 	vectorsLoadStarted = true;
-	startExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', { isLocalLLM });
+	startExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+		isLocalLLM,
+		...(surface ? { surface } : {}),
+	});
 
 	let url: string;
 	try {
 		url = await options.getBinaryUrl();
 	} catch (e) {
 		vectorsLoadStarted = false;
-		failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', { isLocalLLM, errorType: 'resolve_url' });
+		failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+			isLocalLLM,
+			errorType: 'resolve_url',
+			...(surface ? { surface } : {}),
+		});
 		// eslint-disable-next-line no-console
 		console.warn('[text-predictor] Failed to resolve vectors URL:', e);
 		return;
@@ -785,6 +794,7 @@ export const loadVectorsAsync = async (options?: {
 				isLocalLLM,
 				status: res.status,
 				errorType: 'http_error',
+				...(surface ? { surface } : {}),
 			});
 			// eslint-disable-next-line no-console
 			console.warn(`[text-predictor] Failed to load vectors: ${res.status}`);
@@ -819,6 +829,7 @@ export const loadVectorsAsync = async (options?: {
 			wordCount: nWords,
 			dim,
 			sizeBytes: float32.byteLength,
+			...(surface ? { surface } : {}),
 		});
 		if (isAutocompleteDebugEnabled()) {
 			// eslint-disable-next-line no-console
@@ -830,7 +841,11 @@ export const loadVectorsAsync = async (options?: {
 		}
 	} catch (e) {
 		vectorsLoadStarted = false;
-		failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', { isLocalLLM, errorType: 'network' });
+		failExp(EXPERIENCE_NAME.LOAD_VECTORS, 'singleton', {
+			isLocalLLM,
+			errorType: 'network',
+			...(surface ? { surface } : {}),
+		});
 		// eslint-disable-next-line no-console
 		console.warn('[text-predictor] Failed to load vectors:', e);
 	}
@@ -842,7 +857,10 @@ export const initVectors = (store: VectorStore): void => {
 
 let vocabularyLoadPromise: Promise<void> | undefined;
 
-export const loadDefaultVocabulary = (options?: { isLocalLLM?: boolean }): Promise<void> => {
+export const loadDefaultVocabulary = (options?: {
+	isLocalLLM?: boolean;
+	surface?: string;
+}): Promise<void> => {
 	if (isInitialized) {
 		return Promise.resolve();
 	}
@@ -851,8 +869,12 @@ export const loadDefaultVocabulary = (options?: { isLocalLLM?: boolean }): Promi
 	}
 
 	const isLocalLLM = options?.isLocalLLM ?? false;
+	const surface = options?.surface;
 	vocabularyLoadPromise = (async () => {
-		startExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', { isLocalLLM });
+		startExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', {
+			isLocalLLM,
+			...(surface ? { surface } : {}),
+		});
 
 		try {
 			// The L2 vocabulary and L3 word list are code-split into their own async
@@ -890,11 +912,13 @@ export const loadDefaultVocabulary = (options?: { isLocalLLM?: boolean }): Promi
 				isLocalLLM,
 				l2WordCount: terms.length,
 				l3WordCount: l3VocabularyData.length,
+				...(surface ? { surface } : {}),
 			});
 		} catch (e) {
 			failExp(EXPERIENCE_NAME.LOAD_VOCABULARY, 'singleton', {
 				isLocalLLM,
 				errorType: 'parse_error',
+				...(surface ? { surface } : {}),
 			});
 			// Allow a later call to retry the load rather than caching the failure.
 			vocabularyLoadPromise = undefined;