circular dep, inferred troubles

Author: lerouxb

package-lock.json

@@ -56,6 +56,7 @@
     "@mongodb-js/compass-telemetry": "^1.14.0",
     "@mongodb-js/connection-info": "^0.17.1",
     "@mongodb-js/compass-logging": "^1.7.12",
+    "@mongodb-js/compass-generative-ai": "^0.51.0",
     "mongodb-connection-string-url": "^3.0.1",
     "ai": "^5.0.26",
     "compass-preferences-model": "^2.51.0",

packages/compass-assistant/package.json

@@ -84,23 +84,26 @@ export function useAssistantActions(): AssistantActionsContextType & {
   };
 }
 
-export const compassAssistantServiceLocator = createServiceLocator(function () {
-  const { isAssistantEnabled, ...actions } = useAssistantActions();
+export type CompassAssistantService = AssistantActionsContextType & {
+  getIsAssistantEnabled: () => boolean;
+};
 
-  const assistantEnabledRef = useRef(isAssistantEnabled);
-  assistantEnabledRef.current = isAssistantEnabled;
+export const compassAssistantServiceLocator = createServiceLocator(
+  function (): CompassAssistantService {
+    const { isAssistantEnabled, ...actions } = useAssistantActions();
 
-  return {
-    ...actions,
-    getIsAssistantEnabled() {
-      return assistantEnabledRef.current;
-    },
-  };
-}, 'compassAssistantLocator');
+    const assistantEnabledRef = useRef(isAssistantEnabled);
+    assistantEnabledRef.current = isAssistantEnabled;
 
-export type CompassAssistantService = ReturnType<
-  typeof compassAssistantServiceLocator
->;
+    return {
+      ...actions,
+      getIsAssistantEnabled() {
+        return assistantEnabledRef.current;
+      },
+    };
+  },
+  'compassAssistantLocator'
+);
 
 export const AssistantProvider: React.FunctionComponent<
   PropsWithChildren<{

packages/compass-assistant/src/compass-assistant-provider.tsx

@@ -5,7 +5,7 @@ import {
 } from 'compass-preferences-model/provider';
 import type { AtlasService } from '@mongodb-js/atlas-service/provider';
 import { AtlasServiceError } from '@mongodb-js/atlas-service/renderer';
-import type { ConnectionInfo } from '@mongodb-js/compass-connections/provider';
+import type { ConnectionInfo } from '@mongodb-js/connection-info';
 import type { Document } from 'mongodb';
 import type { Logger } from '@mongodb-js/compass-logging';
 import { EJSON } from 'bson';