Sync main with 1.6.x branch

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AgentsGenerator.java

@@ -734,10 +734,16 @@ public JsonArray getActions(JsonElement node, Path filePath, Project project, Wo
         }
         String parentSymbolName = variableSymbol.getName().orElseThrow();
         String className = classSymbol.getName().orElseThrow();
+        ModuleInfo moduleInfo = classSymbol.getModule()
+                .map(moduleSymbol -> ModuleInfo.from(moduleSymbol.id()))
+                .orElse(null);
 
         // Obtain methods of the connector
         List<FunctionData> methodFunctionsData = new FunctionDataBuilder()
                 .parentSymbol(classSymbol)
+                .moduleInfo(moduleInfo)
+                .workspaceManager(workspaceManager)
+                .filePath(filePath)
                 .buildChildNodes();
 
         for (FunctionData methodFunction : methodFunctionsData) {

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/AvailableNodesGenerator.java

@@ -52,6 +52,7 @@
 import io.ballerina.modelgenerator.commons.FunctionData;
 import io.ballerina.modelgenerator.commons.FunctionDataBuilder;
 import io.ballerina.modelgenerator.commons.ModuleInfo;
+import io.ballerina.modelgenerator.commons.PackageUtil;
 import io.ballerina.projects.Document;
 import io.ballerina.projects.Package;
 import io.ballerina.tools.text.LinePosition;
@@ -387,11 +388,17 @@ private Optional<Category> getCategory(Symbol symbol, Predicate<ClassSymbol> con
                     .map(moduleSymbol -> ModuleInfo.from(moduleSymbol.id()))
                     .orElse(null);
 
+            // Create and set the resolved package for the function
+            Optional<Package> resolvedPackage = moduleInfo != null ?
+                    PackageUtil.resolveModulePackage(moduleInfo.org(), moduleInfo.packageName(), moduleInfo.version()) :
+                    Optional.empty();
+
             FunctionDataBuilder functionDataBuilder = new FunctionDataBuilder()
                     .parentSymbol(classSymbol)
                     .parentSymbolType(className)
                     .project(pkg.project())
                     .moduleInfo(moduleInfo)
+                    .resolvedPackage(resolvedPackage.orElse(null))
                     .enableIndex();
 
             // Obtain methods of the classes

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/CodeAnalyzer.java

@@ -159,8 +159,10 @@
 import io.ballerina.modelgenerator.commons.FunctionData;
 import io.ballerina.modelgenerator.commons.FunctionDataBuilder;
 import io.ballerina.modelgenerator.commons.ModuleInfo;
+import io.ballerina.modelgenerator.commons.PackageUtil;
 import io.ballerina.modelgenerator.commons.ParameterData;
 import io.ballerina.projects.Document;
+import io.ballerina.projects.Package;
 import io.ballerina.projects.Project;
 import io.ballerina.tools.diagnostics.Location;
 import io.ballerina.tools.text.LinePosition;
@@ -760,11 +762,16 @@ private void setFunctionProperties(String functionName, ExpressionNode expressio
                                        RemoteMethodCallActionNode remoteMethodCallActionNode,
                                        MethodSymbol functionSymbol, String objName,
                                        Map<String, Object> metadataData) {
+        Optional<Package> resolvedPackage = moduleInfo != null ?
+                PackageUtil.resolveModulePackage(moduleInfo.org(), moduleInfo.packageName(), moduleInfo.version()) :
+                Optional.empty();
+
         FunctionDataBuilder functionDataBuilder = new FunctionDataBuilder()
                 .name(functionName)
                 .functionSymbol(functionSymbol)
                 .semanticModel(semanticModel)
-                .userModuleInfo(moduleInfo);
+                .userModuleInfo(moduleInfo)
+                .resolvedPackage(resolvedPackage.orElse(null));
         FunctionData functionData = functionDataBuilder.build();
 
         nodeBuilder

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/McpToolKitBuilder.java

@@ -97,6 +97,8 @@ public void setConcreteTemplateData(TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().parentSymbolType(AI_MCP_TOOL_KIT_CLASS)
                 .name(INIT_METHOD_NAME).moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.MCP_TOOL_KIT)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/Property.java

@@ -553,11 +553,27 @@ public Builder<T> typeWithTemplate(Property.ValueType valueType, Property templa
         }
 
         public Builder<T> typeWithExpression(TypeSymbol typeSymbol, ModuleInfo moduleInfo) {
-            return typeWithExpression(typeSymbol, moduleInfo, null, null, null);
+            return typeWithExpression(typeSymbol, moduleInfo, null, null);
+        }
+
+        public Builder<T> typeWithExpression(TypeSymbol typeSymbol, ModuleInfo moduleInfo, String defaultValue) {
+            return typeWithExpression(typeSymbol, moduleInfo, null, null, defaultValue, null);
+        }
+
+        public Builder<T> typeWithExpression(TypeSymbol typeSymbol, ModuleInfo moduleInfo,
+                                             Node value, SemanticModel semanticModel) {
+            return typeWithExpression(typeSymbol, moduleInfo, value, semanticModel, null, null);
+        }
+
+        public Builder<T> typeWithExpression(TypeSymbol typeSymbol, ModuleInfo moduleInfo,
+                                             Node value, SemanticModel semanticModel,
+                                             Property.Builder<?> builder) {
+            return typeWithExpression(typeSymbol, moduleInfo, value, semanticModel, null, builder);
         }
 
         public Builder<T> typeWithExpression(TypeSymbol typeSymbol, ModuleInfo moduleInfo,
-                                             Node value, SemanticModel semanticModel, Property.Builder<?> builder) {
+                                             Node value, SemanticModel semanticModel, String defaultValue,
+                                             Property.Builder<?> builder) {
             if (typeSymbol == null) {
                 return this;
             }
@@ -585,6 +601,10 @@ public Builder<T> typeWithExpression(TypeSymbol typeSymbol, ModuleInfo moduleInf
 
                 // If all the member types are singletons, treat it as a single-select option
                 if (allSingletons) {
+                    // Reorder options so that the default value appears first
+                    if (defaultValue != null && !defaultValue.isEmpty()) {
+                        options = reorderOptionsByDefaultValue(options, defaultValue);
+                    }
                     type().fieldType(ValueType.SINGLE_SELECT).options(options).stepOut();
                 } else {
                     // Handle union of primitive types by defining an input type for each primitive type
@@ -761,6 +781,39 @@ private ValueType findMatchingValueType(Node node) {
             };
         }
 
+        /**
+         * Reorders enum options so that the option matching the defaultValue appears first in the list.
+         * This improves user experience by showing the default option at the top of dropdown lists.
+         * Returns a new list without modifying the input list.
+         *
+         * @param options      The list of Option objects to reorder
+         * @param defaultValue The default value to prioritize (may contain quotes)
+         * @return A new list with the default option first, or the original list if no match found
+         */
+        private static List<Option> reorderOptionsByDefaultValue(List<Option> options, String defaultValue) {
+            if (options == null || options.isEmpty() || defaultValue == null || defaultValue.isEmpty()) {
+                return new ArrayList<>(options != null ? options : List.of());
+            }
+
+            String cleanedDefaultValue = CommonUtils.removeQuotes(defaultValue);
+            List<Option> reorderedOptions = new ArrayList<>(options);
+
+            // Find and move matching option to front
+            for (int i = 0; i < reorderedOptions.size(); i++) {
+                Option option = reorderedOptions.get(i);
+                String cleanedOptionValue = CommonUtils.removeQuotes(option.value());
+                if (cleanedDefaultValue.equalsIgnoreCase(cleanedOptionValue) ||
+                        cleanedDefaultValue.equalsIgnoreCase(option.value())) {
+                    if (i > 0) {
+                        reorderedOptions.remove(i);
+                        reorderedOptions.addFirst(option);
+                    }
+                    break;
+                }
+            }
+            return reorderedOptions;
+        }
+
         public Builder<T> types(List<PropertyType> existingTypes) {
             if (existingTypes != null) {
                 this.types.addAll(existingTypes);

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/CallBuilder.java

@@ -44,8 +44,6 @@
 import io.ballerina.modelgenerator.commons.PackageUtil;
 import io.ballerina.modelgenerator.commons.ParameterData;
 import io.ballerina.projects.Document;
-import io.ballerina.projects.PackageDescriptor;
-import io.ballerina.projects.Project;
 import io.ballerina.projects.ProjectException;
 import io.ballerina.tools.text.LinePosition;
 import org.ballerinalang.langserver.common.utils.CommonUtil;
@@ -78,31 +76,22 @@ public void setConcreteConstData() {
     public void setConcreteTemplateData(TemplateContext context) {
         Codedata codedata = context.codedata();
 
+        ModuleInfo targetModuleInfo = new ModuleInfo(codedata.org(), codedata.packageName(), codedata.module(),
+                codedata.version());
         FunctionDataBuilder functionDataBuilder = new FunctionDataBuilder()
                 .name(codedata.symbol())
-                .moduleInfo(new ModuleInfo(codedata.org(), codedata.packageName(), codedata.module(),
-                        codedata.version()))
+                .moduleInfo(targetModuleInfo)
                 .lsClientLogger(context.lsClientLogger())
                 .functionResultKind(getFunctionResultKind())
                 .project(PackageUtil.loadProject(context.workspaceManager(), context.filePath()))
-                .userModuleInfo(moduleInfo);
+                .userModuleInfo(moduleInfo)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath());
 
         NodeKind functionNodeKind = getFunctionNodeKind();
         if (functionNodeKind != NodeKind.FUNCTION_CALL) {
             functionDataBuilder.parentSymbolType(codedata.object());
         }
-
-        // Set the semantic model if the function is local
-        boolean isLocalFunction = isLocalFunction(context.workspaceManager(), context.filePath(), codedata);
-        if (isLocalFunction) {
-            WorkspaceManager workspaceManager = context.workspaceManager();
-            PackageUtil.loadProject(context.workspaceManager(), context.filePath());
-            context.workspaceManager().module(context.filePath())
-                    .map(module -> ModuleInfo.from(module.descriptor()))
-                    .ifPresent(functionDataBuilder::userModuleInfo);
-            SemanticModel semanticModel = workspaceManager.semanticModel(context.filePath()).orElseThrow();
-            functionDataBuilder.semanticModel(semanticModel);
-        }
         FunctionData functionData = functionDataBuilder.build();
 
         metadata()
@@ -129,7 +118,8 @@ public void setConcreteTemplateData(TemplateContext context) {
                     .label(Property.CONNECTION_LABEL)
                     .description(Property.CONNECTION_DOC)
                     .stepOut()
-                    .type(Property.ValueType.EXPRESSION, isLocalFunction ? codedata.object() :
+                    .type(Property.ValueType.EXPRESSION, PackageUtil.isLocalFunction(context.workspaceManager(),
+                            context.filePath(), codedata.org(), codedata.module()) ? codedata.object() :
                             CommonUtils.getClassType(codedata.module(), codedata.object()))
                     .value(codedata.parentSymbol())
                     .hidden()
@@ -234,7 +224,8 @@ protected void setParameterProperties(FunctionData function) {
                                 .selected(true)
                                 .stepOut();
                     }
-                    customPropBuilder.typeWithExpression(paramResult.typeSymbol(), moduleInfo);
+                    customPropBuilder.typeWithExpression(paramResult.typeSymbol(), moduleInfo,
+                            paramResult.defaultValue());
                 }
             }
 
@@ -380,20 +371,4 @@ private static String resolveConcreteType(WorkspaceManager workspaceManager, Pat
         }
     }
 
-    protected static boolean isLocalFunction(WorkspaceManager workspaceManager, Path filePath, Codedata codedata) {
-        if (codedata.org() == null || codedata.module() == null) {
-            return false;
-        }
-        try {
-            Project project = workspaceManager.loadProject(filePath);
-            PackageDescriptor descriptor = project.currentPackage().descriptor();
-            String packageOrg = descriptor.org().value();
-            String packageName = descriptor.name().value();
-
-            return packageOrg.equals(codedata.org())
-                    && packageName.equals(codedata.module());
-        } catch (WorkspaceDocumentException | EventSyncException e) {
-            return false;
-        }
-    }
 }

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/ChunkerBuilder.java

@@ -85,6 +85,8 @@ public void setConcreteTemplateData(TemplateContext context) {
 
         FunctionData functionData = new FunctionDataBuilder().parentSymbolType(codedata.object())
                 .name(codedata.symbol()).moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.CHUNKER)
                 .build();
 

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/DataLoaderBuilder.java

@@ -82,6 +82,8 @@ public void setConcreteTemplateData(NodeBuilder.TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().parentSymbolType(codedata.object())
                 .name(codedata.symbol()).moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.DATA_LOADER)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/EmbeddingProviderBuilder.java

@@ -98,6 +98,8 @@ public void setConcreteTemplateData(NodeBuilder.TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .parentSymbolType(codedata.object()).name(codedata.symbol())
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.EMBEDDING_PROVIDER)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/FunctionCall.java

@@ -27,6 +27,7 @@
 import io.ballerina.flowmodelgenerator.core.model.SourceBuilder;
 import io.ballerina.flowmodelgenerator.core.utils.FlowNodeUtil;
 import io.ballerina.modelgenerator.commons.FunctionData;
+import io.ballerina.modelgenerator.commons.PackageUtil;
 import org.eclipse.lsp4j.TextEdit;
 
 import java.nio.file.Path;
@@ -60,7 +61,8 @@ public Map<Path, List<TextEdit>> toSource(SourceBuilder sourceBuilder) {
             sourceBuilder.token().keyword(SyntaxKind.CHECK_KEYWORD);
         }
 
-        if (isLocalFunction(sourceBuilder.workspaceManager, sourceBuilder.filePath, codedata)) {
+        if (PackageUtil.isLocalFunction(sourceBuilder.workspaceManager, sourceBuilder.filePath,
+                codedata.org(), codedata.module())) {
             return sourceBuilder.token()
                     .name(codedata.symbol())
                     .stepOut()

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/KnowledgeBaseBuilder.java

@@ -87,6 +87,8 @@ public void setConcreteTemplateData(NodeBuilder.TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().parentSymbolType(codedata.object())
                 .name(codedata.symbol()).moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.KNOWLEDGE_BASE)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/MemoryBuilder.java

@@ -73,6 +73,8 @@ public void setConcreteTemplateData(TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .parentSymbolType(codedata.object()).name(codedata.symbol())
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.MEMORY)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/MemoryStoreBuilder.java

@@ -73,6 +73,8 @@ public void setConcreteTemplateData(TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .parentSymbolType(codedata.object()).name(codedata.symbol())
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.MEMORY_STORE)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())

flow-model-generator/modules/flow-model-generator-core/src/main/java/io/ballerina/flowmodelgenerator/core/model/node/ModelProviderBuilder.java

@@ -103,6 +103,8 @@ public void setConcreteTemplateData(TemplateContext context) {
         FunctionData functionData = new FunctionDataBuilder().moduleInfo(codedataModuleInfo).userModuleInfo(moduleInfo)
                 .parentSymbolType(codedata.object()).name(codedata.symbol())
                 .lsClientLogger(context.lsClientLogger()).functionResultKind(FunctionData.Kind.MODEL_PROVIDER)
+                .workspaceManager(context.workspaceManager())
+                .filePath(context.filePath())
                 .build();
 
         metadata().label(functionData.packageName()).description(functionData.description())