diff --git a/.idea/modules.xml b/.idea/modules.xml
index eb6ffcb4c7fa..53cee3aaa102 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -407,6 +407,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.debugger/intellij.devkit.debugger.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.debugger/intellij.devkit.debugger.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.gradle.tooling/intellij.devkit.gradle.tooling.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.gradle.tooling/intellij.devkit.gradle.tooling.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.tests.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.i18n/intellij.devkit.i18n.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/devkit/intellij.devkit.intelliLang/intellij.devkit.intelliLang.iml" filepath="$PROJECT_DIR$/plugins/devkit/intellij.devkit.intelliLang/intellij.devkit.intelliLang.iml" />
diff --git a/build/bazel-generated-file-list.txt b/build/bazel-generated-file-list.txt
index 439e619a425d..a9d1505028da 100644
--- a/build/bazel-generated-file-list.txt
+++ b/build/bazel-generated-file-list.txt
@@ -1034,6 +1034,7 @@ plugins/devkit/devkit-tests
 plugins/devkit/intellij.devkit.compose
 plugins/devkit/intellij.devkit.debugger
 plugins/devkit/intellij.devkit.gradle
+plugins/devkit/intellij.devkit.gradle.tooling
 plugins/devkit/intellij.devkit.i18n
 plugins/devkit/intellij.devkit.intelliLang
 plugins/devkit/intellij.devkit.mcp
diff --git a/plugins/devkit/intellij.devkit.gradle.tooling/BUILD.bazel b/plugins/devkit/intellij.devkit.gradle.tooling/BUILD.bazel
new file mode 100644
index 000000000000..49ad61bcbeb2
--- /dev/null
+++ b/plugins/devkit/intellij.devkit.gradle.tooling/BUILD.bazel
@@ -0,0 +1,56 @@
+load("@rules_jvm//:jvm.bzl", "jvm_library")
+
+### auto-generated section `build intellij.devkit.gradle.tooling` start
+
+jvm_library(
+    name = "gradle-tooling",
+    srcs = glob(
+        [
+            "src/**/*.kt",
+            "src/**/*.java",
+            "src/**/*.form",
+        ],
+        allow_empty = True,
+    ),
+    kotlinc_opts = "@community//:k8",
+    module_name = "intellij.devkit.gradle.tooling",
+    resource_strip_prefix = "resources",
+    resources = glob(
+        ["resources/**/*"],
+    ),
+    visibility = ["//visibility:public"],
+    deps = [
+        # do not sort,
+        "@lib//:jetbrains-annotations",
+        "//plugins/gradle/tooling-extension-impl:toolingExtension-impl",
+        "@lib//:gradle-provided",
+    ],
+)
+
+jvm_library(
+    name = "gradle-tooling_test_lib",
+    testonly = True,
+    srcs = glob(
+        [],
+        allow_empty = True,
+    ),
+    kotlinc_opts = "@community//:k8",
+    module_name = "intellij.devkit.gradle.tooling",
+    visibility = ["//visibility:public"],
+    runtime_deps = [
+        # do not sort,
+        ":gradle-tooling",
+        "//plugins/gradle/tooling-extension-impl:toolingExtension-impl_test_lib",
+        "@lib//:gradle-provided",
+    ],
+)
+### auto-generated section `build intellij.devkit.gradle.tooling` end
+
+### auto-generated section `iml intellij.devkit.gradle.tooling` start
+exports_files(
+    [
+        "intellij.devkit.gradle.tooling.iml",
+    ],
+    visibility = ["//visibility:public"],
+)
+### auto-generated section `iml intellij.devkit.gradle.tooling` end
diff --git a/plugins/devkit/intellij.devkit.gradle.tooling/intellij.devkit.gradle.tooling.iml b/plugins/devkit/intellij.devkit.gradle.tooling/intellij.devkit.gradle.tooling.iml
new file mode 100644
index 000000000000..9180a707d8a7
--- /dev/null
+++ b/plugins/devkit/intellij.devkit.gradle.tooling/intellij.devkit.gradle.tooling.iml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="jetbrains-annotations" level="project" />
+    <orderEntry type="module" module-name="intellij.gradle.toolingExtension.impl" />
+    <orderEntry type="library" scope="PROVIDED" name="Gradle" level="project" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/plugins/devkit/intellij.devkit.gradle.tooling/resources/intellij.devkit.gradle.tooling.xml b/plugins/devkit/intellij.devkit.gradle.tooling/resources/intellij.devkit.gradle.tooling.xml
new file mode 100644
index 000000000000..e467e3052012
--- /dev/null
+++ b/plugins/devkit/intellij.devkit.gradle.tooling/resources/intellij.devkit.gradle.tooling.xml
@@ -0,0 +1,5 @@
+<idea-plugin>
+  <dependencies>
+    <module name="intellij.gradle.toolingExtension.impl"/>
+  </dependencies>
+</idea-plugin>
diff --git a/plugins/devkit/intellij.devkit.gradle/BUILD.bazel b/plugins/devkit/intellij.devkit.gradle/BUILD.bazel
index 9abfeefbadf5..3e2139c2d043 100644
--- a/plugins/devkit/intellij.devkit.gradle/BUILD.bazel
+++ b/plugins/devkit/intellij.devkit.gradle/BUILD.bazel
@@ -35,8 +35,10 @@ jvm_library(
         "//platform/analysis-api:analysis",
         "//platform/execution",
         "//platform/lang-api:lang",
+        "//plugins/gradle",
         "//plugins/gradle:gradle-common",
         "//plugins/gradle/java",
+        "//plugins/devkit/intellij.devkit.gradle.tooling:gradle-tooling",
         "//platform/smRunner",
         "//plugins/devkit/devkit-core:core",
         "//platform/util:util-ui",
@@ -78,8 +80,10 @@ jvm_library(
         "//platform/analysis-api:analysis_test_lib",
         "//platform/execution:execution_test_lib",
         "//platform/lang-api:lang_test_lib",
+        "//plugins/gradle:gradle_test_lib",
         "//plugins/gradle:gradle-common_test_lib",
         "//plugins/gradle/java:java_test_lib",
+        "//plugins/devkit/intellij.devkit.gradle.tooling:gradle-tooling_test_lib",
         "//platform/smRunner:smRunner_test_lib",
         "//plugins/devkit/devkit-core:core_test_lib",
         "//platform/util:util-ui_test_lib",
diff --git a/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml b/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
index fcf9a704d48d..26f855812a42 100644
--- a/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
+++ b/plugins/devkit/intellij.devkit.gradle/intellij.devkit.gradle.iml
@@ -22,8 +22,10 @@
     <orderEntry type="module" module-name="intellij.platform.analysis" />
     <orderEntry type="module" module-name="intellij.platform.execution" />
     <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.gradle" />
     <orderEntry type="module" module-name="intellij.gradle.common" />
     <orderEntry type="module" module-name="intellij.gradle.java" />
+    <orderEntry type="module" module-name="intellij.devkit.gradle.tooling" />
     <orderEntry type="module" module-name="intellij.platform.smRunner" />
     <orderEntry type="module" module-name="intellij.devkit.core" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
diff --git a/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml b/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
index cb12bdbb026c..fc9f1c55a61a 100644
--- a/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
+++ b/plugins/devkit/intellij.devkit.gradle/resources/intellij.devkit.gradle.xml
@@ -2,6 +2,7 @@
   <!-- region Generated dependencies - run `Generate Product Layouts` to regenerate -->
   <dependencies>
     <module name="intellij.devkit.core"/>
+    <module name="intellij.devkit.gradle.tooling"/>
     <module name="intellij.gradle.java"/>
     <module name="intellij.java.psi"/>
     <module name="intellij.java.ui"/>
diff --git a/plugins/devkit/plugin-content.yaml b/plugins/devkit/plugin-content.yaml
index e07b8cf624e2..b028948e60de 100644
--- a/plugins/devkit/plugin-content.yaml
+++ b/plugins/devkit/plugin-content.yaml
@@ -22,6 +22,9 @@
 - name: lib/modules/intellij.devkit.gradle.jar
   contentModules:
   - name: intellij.devkit.gradle
+- name: lib/modules/intellij.devkit.gradle.tooling.jar
+  contentModules:
+  - name: intellij.devkit.gradle.tooling
 - name: lib/modules/intellij.devkit.i18n.jar
   contentModules:
   - name: intellij.devkit.i18n
diff --git a/plugins/devkit/resources/META-INF/plugin.xml b/plugins/devkit/resources/META-INF/plugin.xml
index 8e4e7e366e40..1dfa155734e7 100644
--- a/plugins/devkit/resources/META-INF/plugin.xml
+++ b/plugins/devkit/resources/META-INF/plugin.xml
@@ -30,6 +30,7 @@
     <module name="intellij.devkit.core"/>
     <module name="intellij.devkit.compose"/>
     <module name="intellij.devkit.gradle"/>
+    <module name="intellij.devkit.gradle.tooling"/>
     <module name="intellij.devkit.i18n"/>
     <module name="intellij.devkit.intelliLang"/>
     <module name="intellij.devkit.themes"/>