diff --git a/.idea/modules.xml b/.idea/modules.xml
index c0a1ad5fd1e4..26341c6265e5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -49,14 +49,16 @@
       <module fileurl="file://$PROJECT_DIR$/fleet/util/serialization/fleet.util.serialization.iml" filepath="$PROJECT_DIR$/fleet/util/serialization/fleet.util.serialization.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/ai-review/intellij.agent.workbench.ai.review.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/ai-review/intellij.agent.workbench.ai.review.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/ai-review/intellij.agent.workbench.ai.review.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/ai-review/intellij.agent.workbench.ai.review.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/chat/intellij.agent.workbench.chat.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/chat/intellij.agent.workbench.chat.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/chat/intellij.agent.workbench.chat.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/chat/intellij.agent.workbench.chat.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/claude/awb/intellij.agent.workbench.claude.awb.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/claude/awb/intellij.agent.workbench.claude.awb.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/claude/awb/intellij.agent.workbench.claude.awb.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/claude/awb/intellij.agent.workbench.claude.awb.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/chat/intellij.agent.workbench.codex.chat.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/chat/intellij.agent.workbench.codex.chat.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/chat/intellij.agent.workbench.codex.chat.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/chat/intellij.agent.workbench.codex.chat.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/ide/intellij.agent.workbench.codex.ide.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/ide/intellij.agent.workbench.codex.ide.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/ide/intellij.agent.workbench.codex.ide.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/ide/intellij.agent.workbench.codex.ide.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/prompt-suggestions/intellij.agent.workbench.codex.prompt.suggestions.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/prompt-suggestions/intellij.agent.workbench.codex.prompt.suggestions.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/prompt-suggestions/intellij.agent.workbench.codex.prompt.suggestions.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/prompt-suggestions/intellij.agent.workbench.codex.prompt.suggestions.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/thread-view/intellij.agent.workbench.codex.thread.view.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/thread-view/intellij.agent.workbench.codex.thread.view.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/codex/thread-view/intellij.agent.workbench.codex.thread.view.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/codex/thread-view/intellij.agent.workbench.codex.thread.view.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/engine/intellij.agent.workbench.engine.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/engine/intellij.agent.workbench.engine.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/engine/intellij.agent.workbench.engine.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/engine/intellij.agent.workbench.engine.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/pi/awb/intellij.agent.workbench.pi.awb.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/pi/awb/intellij.agent.workbench.pi.awb.iml" />
@@ -88,8 +90,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/sessions-toolwindow/intellij.agent.workbench.sessions.toolwindow.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/settings/intellij.agent.workbench.settings.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/settings/intellij.agent.workbench.settings.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/settings/intellij.agent.workbench.settings.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/settings/intellij.agent.workbench.settings.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/thread-view/intellij.agent.workbench.thread.view.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/thread-view/intellij.agent.workbench.thread.view.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/thread-view/intellij.agent.workbench.thread.view.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/thread-view/intellij.agent.workbench.thread.view.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/ui/intellij.agent.workbench.ui.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/ui/intellij.agent.workbench.ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/ui/intellij.agent.workbench.ui.tests.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/ui/intellij.agent.workbench.ui.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/agent-workbench/vcs-merge/intellij.agent.workbench.vcs.merge.iml" filepath="$PROJECT_DIR$/plugins/agent-workbench/vcs-merge/intellij.agent.workbench.vcs.merge.iml" />
@@ -953,6 +953,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/plugin-updater/intellij.kotlin.plugin.updater.iml" filepath="$PROJECT_DIR$/plugins/kotlin/plugin-updater/intellij.kotlin.plugin.updater.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/preferences/intellij.kotlin.preferences.iml" filepath="$PROJECT_DIR$/plugins/kotlin/preferences/intellij.kotlin.preferences.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml" filepath="$PROJECT_DIR$/plugins/kotlin/project-configuration/intellij.kotlin.projectConfiguration.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/project-configuration-vcs/intellij.kotlin.projectConfiguration.vcs.iml" filepath="$PROJECT_DIR$/plugins/kotlin/project-configuration-vcs/intellij.kotlin.projectConfiguration.vcs.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.iml" filepath="$PROJECT_DIR$/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/base/fir/project-structure/intellij.kotlin.projectStructure.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/project-wizard/cli/intellij.kotlin.projectWizard.cli.iml" filepath="$PROJECT_DIR$/plugins/kotlin/project-wizard/cli/intellij.kotlin.projectWizard.cli.iml" />
@@ -991,9 +992,9 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" filepath="$PROJECT_DIR$/plugins/laf/win10/intellij.laf.win10.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTests/intellij.lambda.sampleTests.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTests/intellij.lambda.sampleTests.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithFixtures/plugin/intellij.lambda.sampleTestsWithFixtures.plugin.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithFixtures/plugin/intellij.lambda.sampleTestsWithFixtures.plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.plugin/intellij.lambda.sampleTestsWithFixtures.plugin.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithFixtures/intellij.lambda.sampleTestsWithFixtures.plugin/intellij.lambda.sampleTestsWithFixtures.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithPlugin/intellij.lambda.sampleTestsWithPlugin.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithPlugin/intellij.lambda.sampleTestsWithPlugin.iml" />
-      <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithPlugin/plugin/intellij.lambda.sampleTestsWithPlugin.plugin.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithPlugin/plugin/intellij.lambda.sampleTestsWithPlugin.plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithPlugin/intellij.lambda.sampleTestsWithPlugin.plugin/intellij.lambda.sampleTestsWithPlugin.plugin.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.sampleTestsWithPlugin/intellij.lambda.sampleTestsWithPlugin.plugin/intellij.lambda.sampleTestsWithPlugin.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.testFramework/plugin/intellij.lambda.test.plugin.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.testFramework/plugin/intellij.lambda.test.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/tools/intellij.lambda.testFramework/intellij.lambda.testFramework.iml" filepath="$PROJECT_DIR$/tools/intellij.lambda.testFramework/intellij.lambda.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/aalto-xml/intellij.libraries.aalto.xml.iml" filepath="$PROJECT_DIR$/libraries/aalto-xml/intellij.libraries.aalto.xml.iml" />
@@ -1013,6 +1014,8 @@
       <module fileurl="file://$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" filepath="$PROJECT_DIR$/platform/libraries/cglib/intellij.libraries.cglib.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/classgraph/intellij.libraries.classgraph.iml" filepath="$PROJECT_DIR$/libraries/classgraph/intellij.libraries.classgraph.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/cli-parser/intellij.libraries.cli.parser.iml" filepath="$PROJECT_DIR$/libraries/cli-parser/intellij.libraries.cli.parser.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/clikt/intellij.libraries.clikt.iml" filepath="$PROJECT_DIR$/libraries/clikt/intellij.libraries.clikt.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/cloud-config-client/intellij.libraries.cloud.config.client.iml" filepath="$PROJECT_DIR$/libraries/cloud-config-client/intellij.libraries.cloud.config.client.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/coil/intellij.libraries.coil.iml" filepath="$PROJECT_DIR$/libraries/coil/intellij.libraries.coil.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/commons/cli/intellij.libraries.commons.cli.iml" filepath="$PROJECT_DIR$/libraries/commons/cli/intellij.libraries.commons.cli.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/commons/codec/intellij.libraries.commons.codec.iml" filepath="$PROJECT_DIR$/libraries/commons/codec/intellij.libraries.commons.codec.iml" />
@@ -1027,6 +1030,11 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml" filepath="$PROJECT_DIR$/libraries/compose-runtime-desktop/intellij.libraries.compose.runtime.desktop.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/dokka/intellij.libraries.dokka.iml" filepath="$PROJECT_DIR$/libraries/dokka/intellij.libraries.dokka.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/download-pgp-verifier/intellij.libraries.download.pgp.verifier.iml" filepath="$PROJECT_DIR$/libraries/download-pgp-verifier/intellij.libraries.download.pgp.verifier.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/ec4j/core/intellij.libraries.ec4j.core.iml" filepath="$PROJECT_DIR$/libraries/ec4j/core/intellij.libraries.ec4j.core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/lsp4j/intellij.libraries.eclipse.lsp4j.iml" filepath="$PROJECT_DIR$/libraries/lsp4j/intellij.libraries.eclipse.lsp4j.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/lsp4j/debug/intellij.libraries.eclipse.lsp4j.debug.iml" filepath="$PROJECT_DIR$/libraries/lsp4j/debug/intellij.libraries.eclipse.lsp4j.debug.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/lsp4j/jsonrpc/intellij.libraries.eclipse.lsp4j.jsonrpc.iml" filepath="$PROJECT_DIR$/libraries/lsp4j/jsonrpc/intellij.libraries.eclipse.lsp4j.jsonrpc.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/lsp4j/jsonrpc-debug/intellij.libraries.eclipse.lsp4j.jsonrpc.debug.iml" filepath="$PROJECT_DIR$/libraries/lsp4j/jsonrpc-debug/intellij.libraries.eclipse.lsp4j.jsonrpc.debug.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/fastutil/intellij.libraries.fastutil.iml" filepath="$PROJECT_DIR$/libraries/fastutil/intellij.libraries.fastutil.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/groovy/intellij.libraries.groovy.iml" filepath="$PROJECT_DIR$/libraries/groovy/intellij.libraries.groovy.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/groovy/ant/intellij.libraries.groovy.ant.iml" filepath="$PROJECT_DIR$/libraries/groovy/ant/intellij.libraries.groovy.ant.iml" />
@@ -1078,9 +1086,12 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/jettison/intellij.libraries.jettison.iml" filepath="$PROJECT_DIR$/libraries/jettison/intellij.libraries.jettison.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml" filepath="$PROJECT_DIR$/libraries/jgoodies/common/intellij.libraries.jgoodies.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml" filepath="$PROJECT_DIR$/libraries/jgoodies/forms/intellij.libraries.jgoodies.forms.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/jline/intellij.libraries.jline.iml" filepath="$PROJECT_DIR$/libraries/jline/intellij.libraries.jline.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/joni/intellij.libraries.joni.iml" filepath="$PROJECT_DIR$/libraries/joni/intellij.libraries.joni.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsch-agent-proxy/intellij.libraries.jsch.agent.proxy.iml" filepath="$PROJECT_DIR$/libraries/jsch-agent-proxy/intellij.libraries.jsch.agent.proxy.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsonpath/intellij.libraries.jsonpath.iml" filepath="$PROJECT_DIR$/libraries/jsonpath/intellij.libraries.jsonpath.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsoup/intellij.libraries.jsoup.iml" filepath="$PROJECT_DIR$/libraries/jsoup/intellij.libraries.jsoup.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/jsp/intellij.libraries.jsp.iml" filepath="$PROJECT_DIR$/libraries/jsp/intellij.libraries.jsp.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jspecify/intellij.libraries.jspecify.iml" filepath="$PROJECT_DIR$/libraries/jspecify/intellij.libraries.jspecify.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/jsvg/intellij.libraries.jsvg.iml" filepath="$PROJECT_DIR$/libraries/jsvg/intellij.libraries.jsvg.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" filepath="$PROJECT_DIR$/libraries/junit4/intellij.libraries.junit4.iml" />
@@ -1156,6 +1167,7 @@
       <module fileurl="file://$PROJECT_DIR$/libraries/rd/text/intellij.libraries.rd.text.iml" filepath="$PROJECT_DIR$/libraries/rd/text/intellij.libraries.rd.text.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/rhino/intellij.libraries.rhino.iml" filepath="$PROJECT_DIR$/libraries/rhino/intellij.libraries.rhino.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/semver/intellij.libraries.semver.iml" filepath="$PROJECT_DIR$/libraries/semver/intellij.libraries.semver.iml" />
+      <module fileurl="file://$PROJECT_DIR$/libraries/semver4j/intellij.libraries.semver4j.iml" filepath="$PROJECT_DIR$/libraries/semver4j/intellij.libraries.semver4j.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" filepath="$PROJECT_DIR$/libraries/skiko/intellij.libraries.skiko.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/snakeyaml/intellij.libraries.snakeyaml.iml" filepath="$PROJECT_DIR$/libraries/snakeyaml/intellij.libraries.snakeyaml.iml" />
       <module fileurl="file://$PROJECT_DIR$/libraries/snakeyaml-engine/intellij.libraries.snakeyaml.engine.iml" filepath="$PROJECT_DIR$/libraries/snakeyaml-engine/intellij.libraries.snakeyaml.engine.iml" />
@@ -1197,6 +1209,8 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/plugin/intellij.markdown.plugin.main.iml" filepath="$PROJECT_DIR$/plugins/markdown/plugin/intellij.markdown.plugin.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/spellchecker/intellij.markdown.spellchecker.iml" filepath="$PROJECT_DIR$/plugins/markdown/spellchecker/intellij.markdown.spellchecker.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/test/intellij.markdown.tests.iml" filepath="$PROJECT_DIR$/plugins/markdown/test/intellij.markdown.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/markdown-preview/intellij.markdown.webview.preview.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/markdown-preview/intellij.markdown.webview.preview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/markdown-preview/tests/intellij.markdown.webview.preview.tests.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/markdown-preview/tests/intellij.markdown.webview.preview.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/markdown/xml/intellij.markdown.xml.iml" filepath="$PROJECT_DIR$/plugins/markdown/xml/intellij.markdown.xml.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/marketplace-ml/intellij.marketplaceMl.iml" filepath="$PROJECT_DIR$/plugins/marketplace-ml/intellij.marketplaceMl.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/maven/intellij.maven.iml" filepath="$PROJECT_DIR$/plugins/maven/intellij.maven.iml" />
@@ -1254,6 +1268,7 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/backend/intellij.performanceTesting.backend.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/backend/intellij.performanceTesting.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/freezes/intellij.performanceTesting.freezes.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/freezes/intellij.performanceTesting.freezes.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/frontend/intellij.performanceTesting.frontend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/problemsView/intellij.performanceTesting.problemsView.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/problemsView/intellij.performanceTesting.problemsView.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver/intellij.performanceTesting.remoteDriver.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver.compose/intellij.performanceTesting.remoteDriver.compose.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/performanceTesting/remote-driver.jcef/intellij.performanceTesting.remoteDriver.jcef.iml" filepath="$PROJECT_DIR$/plugins/performanceTesting/remote-driver.jcef/intellij.performanceTesting.remoteDriver.jcef.iml" />
@@ -1484,6 +1499,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/ui/intellij.platform.ide.ui.iml" filepath="$PROJECT_DIR$/platform/platform-impl/ui/intellij.platform.ide.ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml" filepath="$PROJECT_DIR$/platform/platform-impl/ui-inspector/intellij.platform.ide.ui.inspector.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml" filepath="$PROJECT_DIR$/platform/platform-impl/update-checker/intellij.platform.ide.updateChecker.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/platform-impl/update-checker/backend/intellij.platform.ide.updateChecker.backend.iml" filepath="$PROJECT_DIR$/platform/platform-impl/update-checker/backend/intellij.platform.ide.updateChecker.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-util-io/intellij.platform.ide.util.io.iml" filepath="$PROJECT_DIR$/platform/platform-util-io/intellij.platform.ide.util.io.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml" filepath="$PROJECT_DIR$/platform/platform-util-io-impl/intellij.platform.ide.util.io.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/platform-util-netty/intellij.platform.ide.util.netty.iml" filepath="$PROJECT_DIR$/platform/platform-util-netty/intellij.platform.ide.util.netty.iml" />
@@ -1605,10 +1621,16 @@
       <module fileurl="file://$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml" filepath="$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.tests.iml" filepath="$PROJECT_DIR$/platform/polySymbols/intellij.platform.polySymbols.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/pratt/intellij.platform.pratt.iml" filepath="$PROJECT_DIR$/platform/pratt/intellij.platform.pratt.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemsView.backend.iml" filepath="$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemsView.backend.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemsView.backend.tests.iml" filepath="$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemsView.backend.tests.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/frontend/intellij.platform.problemsView.frontend.iml" filepath="$PROJECT_DIR$/platform/problemsView/frontend/intellij.platform.problemsView.frontend.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/shared/intellij.platform.problemsView.shared.iml" filepath="$PROJECT_DIR$/platform/problemsView/shared/intellij.platform.problemsView.shared.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemView.backend.iml" filepath="$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemView.backend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemView.backend.tests.iml" filepath="$PROJECT_DIR$/platform/problemsView/backend/intellij.platform.problemView.backend.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/buildView/intellij.platform.problemView.buildView.iml" filepath="$PROJECT_DIR$/platform/problemsView/buildView/intellij.platform.problemView.buildView.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/collector/intellij.platform.problemView.collector.iml" filepath="$PROJECT_DIR$/platform/problemsView/collector/intellij.platform.problemView.collector.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/core/intellij.platform.problemView.core.iml" filepath="$PROJECT_DIR$/platform/problemsView/core/intellij.platform.problemView.core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/frontend/intellij.platform.problemView.frontend.iml" filepath="$PROJECT_DIR$/platform/problemsView/frontend/intellij.platform.problemView.frontend.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/plugin/intellij.platform.problemView.plugin.iml" filepath="$PROJECT_DIR$/platform/problemsView/plugin/intellij.platform.problemView.plugin.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/shared/intellij.platform.problemView.shared.iml" filepath="$PROJECT_DIR$/platform/problemsView/shared/intellij.platform.problemView.shared.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/ui/intellij.platform.problemView.ui.iml" filepath="$PROJECT_DIR$/platform/problemsView/ui/intellij.platform.problemView.ui.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/problemsView/ui/intellij.platform.problemView.ui.tests.iml" filepath="$PROJECT_DIR$/platform/problemsView/ui/intellij.platform.problemView.ui.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/progress/backend/intellij.platform.progress.backend.iml" filepath="$PROJECT_DIR$/platform/progress/backend/intellij.platform.progress.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/project/shared/intellij.platform.project.iml" filepath="$PROJECT_DIR$/platform/project/shared/intellij.platform.project.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/project/backend/intellij.platform.project.backend.iml" filepath="$PROJECT_DIR$/platform/project/backend/intellij.platform.project.backend.iml" />
@@ -1693,6 +1715,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml" filepath="$PROJECT_DIR$/platform/tasks-platform-impl/intellij.platform.tasks.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/tasks-platform-impl/tasks.impl.bookmarks/intellij.platform.tasks.impl.bookmarks.iml" filepath="$PROJECT_DIR$/platform/tasks-platform-impl/tasks.impl.bookmarks/intellij.platform.tasks.impl.bookmarks.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/tasks-platform-impl/tasks.impl.debugger/intellij.platform.tasks.impl.debugger.iml" filepath="$PROJECT_DIR$/platform/tasks-platform-impl/tasks.impl.debugger/intellij.platform.tasks.impl.debugger.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/tasks-platform-impl/plugin/intellij.platform.tasks.plugin.iml" filepath="$PROJECT_DIR$/platform/tasks-platform-impl/plugin/intellij.platform.tasks.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/testFramework/extensions/intellij.platform.testExtensions.iml" filepath="$PROJECT_DIR$/platform/testFramework/extensions/intellij.platform.testExtensions.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/testFramework/intellij.platform.testFramework.iml" filepath="$PROJECT_DIR$/platform/testFramework/intellij.platform.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/testFramework/common/intellij.platform.testFramework.common.iml" filepath="$PROJECT_DIR$/platform/testFramework/common/intellij.platform.testFramework.common.iml" />
@@ -1734,6 +1757,11 @@
       <module fileurl="file://$PROJECT_DIR$/uast/testFramework/intellij.platform.uast.testFramework.iml" filepath="$PROJECT_DIR$/uast/testFramework/intellij.platform.uast.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/uast/uast-tests/intellij.platform.uast.tests.iml" filepath="$PROJECT_DIR$/uast/uast-tests/intellij.platform.uast.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/ui.jcef/intellij.platform.ui.jcef.iml" filepath="$PROJECT_DIR$/platform/ui.jcef/intellij.platform.ui.jcef.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/intellij.platform.ui.webview.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/intellij.platform.ui.webview.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/demo/intellij.platform.ui.webview.demo.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/demo/intellij.platform.ui.webview.demo.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/jcef/intellij.platform.ui.webview.jcef.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/jcef/intellij.platform.ui.webview.jcef.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/jcef/tests/intellij.platform.ui.webview.jcef.tests.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/jcef/tests/intellij.platform.ui.webview.jcef.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/plugins/ui.webview/tests/intellij.platform.ui.webview.tests.iml" filepath="$PROJECT_DIR$/plugins/ui.webview/tests/intellij.platform.ui.webview.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/usageView/intellij.platform.usageView.iml" filepath="$PROJECT_DIR$/platform/usageView/intellij.platform.usageView.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/usageView-impl/intellij.platform.usageView.impl.iml" filepath="$PROJECT_DIR$/platform/usageView-impl/intellij.platform.usageView.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/util/intellij.platform.util.iml" filepath="$PROJECT_DIR$/platform/util/intellij.platform.util.iml" />
@@ -1789,6 +1817,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/intellij.platform.vcs.log.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/bookmarks/intellij.platform.vcs.log.impl.bookmarks.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/bookmarks/intellij.platform.vcs.log.impl.bookmarks.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-log/impl/intellij.platform.vcs.log.impl.tests.iml" filepath="$PROJECT_DIR$/platform/vcs-log/impl/intellij.platform.vcs.log.impl.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/vcs/plugin/intellij.platform.vcs.plugin.iml" filepath="$PROJECT_DIR$/platform/vcs/plugin/intellij.platform.vcs.plugin.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-api/shared/intellij.platform.vcs.shared.iml" filepath="$PROJECT_DIR$/platform/vcs-api/shared/intellij.platform.vcs.shared.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.testFramework.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.tests.iml" filepath="$PROJECT_DIR$/platform/vcs-tests/intellij.platform.vcs.tests.iml" />
@@ -1816,6 +1845,7 @@
       <module fileurl="file://$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" filepath="$PROJECT_DIR$/python/build/build-debug-binaries/intellij.pycharm.community.build.debugBinaries.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/build/intellij.pycharm.community.build.tests.iml" filepath="$PROJECT_DIR$/python/build/intellij.pycharm.community.build.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.pycharm.community.customization.iml" filepath="$PROJECT_DIR$/python/intellij.pycharm.community.customization.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/ide/customization.backend/intellij.pycharm.community.customization.backend.iml" filepath="$PROJECT_DIR$/python/ide/customization.backend/intellij.pycharm.community.customization.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/ide/customization.shared/intellij.pycharm.community.customization.shared.iml" filepath="$PROJECT_DIR$/python/ide/customization.shared/intellij.pycharm.community.customization.shared.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.iml" filepath="$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml" filepath="$PROJECT_DIR$/python/ide/impl/intellij.pycharm.community.ide.impl.promotion/intellij.pycharm.community.ide.impl.promotion.iml" />
@@ -1869,6 +1899,8 @@
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.helpers.iml" filepath="$PROJECT_DIR$/python/intellij.python.helpers.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.helpers.tests.iml" filepath="$PROJECT_DIR$/python/intellij.python.helpers.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/IntelliLang-python/intellij.python.langInjection.iml" filepath="$PROJECT_DIR$/python/IntelliLang-python/intellij.python.langInjection.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-lsp-core/intellij.python.lsp.core.iml" filepath="$PROJECT_DIR$/python/python-lsp-core/intellij.python.lsp.core.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-lsp-impl/intellij.python.lsp.impl.iml" filepath="$PROJECT_DIR$/python/python-lsp-impl/intellij.python.lsp.impl.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-markdown/intellij.python.markdown.iml" filepath="$PROJECT_DIR$/python/python-markdown/intellij.python.markdown.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-markdown/intellij.python.markdown.tests.iml" filepath="$PROJECT_DIR$/python/python-markdown/intellij.python.markdown.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.ml.features/intellij.python.ml.features.iml" filepath="$PROJECT_DIR$/python/intellij.python.ml.features/intellij.python.ml.features.iml" />
@@ -1883,10 +1915,13 @@
       <module fileurl="file://$PROJECT_DIR$/python/intellij.python.pydev.iml" filepath="$PROJECT_DIR$/python/intellij.python.pydev.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-pyproject/intellij.python.pyproject.iml" filepath="$PROJECT_DIR$/python/python-pyproject/intellij.python.pyproject.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-pyproject/intellij.python.pyproject.tests.iml" filepath="$PROJECT_DIR$/python/python-pyproject/intellij.python.pyproject.tests.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-pyrefly/intellij.python.pyrefly.iml" filepath="$PROJECT_DIR$/python/python-pyrefly/intellij.python.pyrefly.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-pyright/intellij.python.pyright.iml" filepath="$PROJECT_DIR$/python/python-pyright/intellij.python.pyright.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-pytools/intellij.python.pytools.iml" filepath="$PROJECT_DIR$/python/python-pytools/intellij.python.pytools.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-pytools/tests/intellij.python.pytools.tests.iml" filepath="$PROJECT_DIR$/python/python-pytools/tests/intellij.python.pytools.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-pytools-ui/intellij.python.pytools.ui.iml" filepath="$PROJECT_DIR$/python/python-pytools-ui/intellij.python.pytools.ui.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-requirements/intellij.python.requirements.iml" filepath="$PROJECT_DIR$/python/python-requirements/intellij.python.requirements.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-ruff/intellij.python.ruff.iml" filepath="$PROJECT_DIR$/python/python-ruff/intellij.python.ruff.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-sdk/intellij.python.sdk.iml" filepath="$PROJECT_DIR$/python/python-sdk/intellij.python.sdk.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-sdk/intellij.python.sdk.tests.iml" filepath="$PROJECT_DIR$/python/python-sdk/intellij.python.sdk.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-sdk-ui/intellij.python.sdk.ui.iml" filepath="$PROJECT_DIR$/python/python-sdk-ui/intellij.python.sdk.ui.iml" />
@@ -1907,6 +1942,8 @@
       <module fileurl="file://$PROJECT_DIR$/python/python-test-env/plain/intellij.python.test.env.plain.iml" filepath="$PROJECT_DIR$/python/python-test-env/plain/intellij.python.test.env.plain.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-test-env/uv/intellij.python.test.env.uv.iml" filepath="$PROJECT_DIR$/python/python-test-env/uv/intellij.python.test.env.uv.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/tools/intellij.python.tools.iml" filepath="$PROJECT_DIR$/python/tools/intellij.python.tools.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-ty/intellij.python.ty.iml" filepath="$PROJECT_DIR$/python/python-ty/intellij.python.ty.iml" />
+      <module fileurl="file://$PROJECT_DIR$/python/python-type-engine/intellij.python.typeEngine.iml" filepath="$PROJECT_DIR$/python/python-type-engine/intellij.python.typeEngine.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-uv/backend/intellij.python.uv.backend.iml" filepath="$PROJECT_DIR$/python/python-uv/backend/intellij.python.uv.backend.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-uv/common/intellij.python.uv.common.iml" filepath="$PROJECT_DIR$/python/python-uv/common/intellij.python.uv.common.iml" />
       <module fileurl="file://$PROJECT_DIR$/python/python-uv/tests/intellij.python.uv.tests.iml" filepath="$PROJECT_DIR$/python/python-uv/tests/intellij.python.uv.tests.iml" />
@@ -1963,6 +2000,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/smart-update/intellij.smart.update.iml" filepath="$PROJECT_DIR$/platform/smart-update/intellij.smart.update.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/space/jps-plugin/intellij.space.java.jps.iml" filepath="$PROJECT_DIR$/plugins/space/jps-plugin/intellij.space.java.jps.iml" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" filepath="$PROJECT_DIR$/spellchecker/intellij.spellchecker.iml" />
+      <module fileurl="file://$PROJECT_DIR$/spellchecker/vcs/intellij.spellchecker.vcs.iml" filepath="$PROJECT_DIR$/spellchecker/vcs/intellij.spellchecker.vcs.iml" />
       <module fileurl="file://$PROJECT_DIR$/spellchecker/xml/intellij.spellchecker.xml.iml" filepath="$PROJECT_DIR$/spellchecker/xml/intellij.spellchecker.xml.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.tests.iml" filepath="$PROJECT_DIR$/plugins/stats-collector/intellij.statsCollector.tests.iml" />
@@ -2113,7 +2151,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml" filepath="$PROJECT_DIR$/plugins/kotlin/completion/tests-shared/kotlin.completion.tests.shared.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/all-tests-compose/kotlin.compose-all-tests.k2.iml" filepath="$PROJECT_DIR$/plugins/kotlin/all-tests-compose/kotlin.compose-all-tests.k2.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/fir/kotlin.fir.iml" filepath="$PROJECT_DIR$/plugins/kotlin/fir/kotlin.fir.iml" />
-      <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/all-tests-fir/kotlin.fir-all-tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml" filepath="$PROJECT_DIR$/plugins/kotlin/frontend-independent/kotlin.fir.frontend-independent.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/fir/testFramework/kotlin.fir.testFramework.iml" filepath="$PROJECT_DIR$/plugins/kotlin/fir/testFramework/kotlin.fir.testFramework.iml" />
       <module fileurl="file://$PROJECT_DIR$/plugins/kotlin/fir/tests/kotlin.fir.tests.iml" filepath="$PROJECT_DIR$/plugins/kotlin/fir/tests/kotlin.fir.tests.iml" />
diff --git a/plugins/agent-workbench/engine/BUILD.bazel b/plugins/agent-workbench/engine/BUILD.bazel
index 6b5f15fe0db6..09812407f491 100644
--- a/plugins/agent-workbench/engine/BUILD.bazel
+++ b/plugins/agent-workbench/engine/BUILD.bazel
@@ -30,8 +30,6 @@ jvm_library(
         "@lib//:kotlin-stdlib",
         "//libraries/kotlinx/serialization/core",
         "//libraries/kotlinx/serialization/json",
-        "//libraries/markdown",
-        "//platform/analysis-api:analysis",
         "//platform/util/concurrency",
         "//platform/core-api:core",
         "//platform/core-ui",
@@ -44,7 +42,7 @@ jvm_library(
         "//plugins/agent-workbench/lib-agent/core",
         "//plugins/agent-workbench/prompt/core",
         "//plugins/agent-workbench/lib-agent/sessions-core:ai-agent-sessions-core",
-        "//plugins/agent-workbench/thread-view:agent-workbench-thread-view",
+        "//plugins/agent-workbench/chat",
     ],
 )
 
@@ -62,8 +60,6 @@ jvm_library(
         ":engine",
         "//libraries/kotlinx/serialization/core:core_test_lib",
         "//libraries/kotlinx/serialization/json:json_test_lib",
-        "//libraries/markdown:markdown_test_lib",
-        "//platform/analysis-api:analysis_test_lib",
         "//platform/util/concurrency:concurrency_test_lib",
         "//platform/core-api:core_test_lib",
         "//platform/core-ui:core-ui_test_lib",
@@ -76,7 +72,7 @@ jvm_library(
         "//plugins/agent-workbench/lib-agent/core:core_test_lib",
         "//plugins/agent-workbench/prompt/core:core_test_lib",
         "//plugins/agent-workbench/lib-agent/sessions-core:ai-agent-sessions-core_test_lib",
-        "//plugins/agent-workbench/thread-view:agent-workbench-thread-view_test_lib",
+        "//plugins/agent-workbench/chat:chat_test_lib",
     ],
 )
 ### auto-generated section `build intellij.agent.workbench.engine` end
@@ -132,8 +128,6 @@ jvm_library(
         "//platform/core-api:core_test_lib",
         "//platform/util",
         "//platform/util:util_test_lib",
-        "//plugins/agent-workbench/lib-agent/sessions-core:ai-agent-sessions-core",
-        "//plugins/agent-workbench/lib-agent/sessions-core:ai-agent-sessions-core_test_lib",
         "//libraries/junit5",
         "//libraries/junit5:junit5_test_lib",
         "//libraries/assertj-core",
diff --git a/plugins/agent-workbench/engine/intellij.agent.workbench.engine.iml b/plugins/agent-workbench/engine/intellij.agent.workbench.engine.iml
index 2226566bc349..1d7f9499cfdb 100644
--- a/plugins/agent-workbench/engine/intellij.agent.workbench.engine.iml
+++ b/plugins/agent-workbench/engine/intellij.agent.workbench.engine.iml
@@ -9,12 +9,14 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="25" />
-            <stringArg name="apiVersion" arg="2.3" />
-            <stringArg name="languageVersion" arg="2.3" />
+            <stringArg name="apiVersion" arg="2.4" />
+            <stringArg name="languageVersion" arg="2.4" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
+              <args>
+                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
+              </args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -25,29 +27,27 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/core" isTestSource="false" packagePrefix="com.intellij.agent.workbench.engine.core" />
+      <sourceFolder url="file://$MODULE_DIR$/src/platform" isTestSource="false" packagePrefix="com.intellij.agent.workbench.engine.platform" />
+      <sourceFolder url="file://$MODULE_DIR$/src/ui" isTestSource="false" packagePrefix="com.intellij.agent.workbench.engine.ui" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.aiCodeReview" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
+    <orderEntry type="module" module-name="intellij.platform.concurrency" />
     <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
     <orderEntry type="module" module-name="intellij.platform.ide.core" />
-    <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.core.ui" />
     <orderEntry type="module" module-name="intellij.platform.editor.ui" />
-    <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
     <orderEntry type="module" module-name="intellij.platform.util" />
-    <orderEntry type="module" module-name="intellij.platform.diff" />
-    <orderEntry type="module" module-name="intellij.platform.util.diff" />
-    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
-    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
-    <orderEntry type="module" module-name="intellij.platform.vcs" />
-    <orderEntry type="module" module-name="intellij.platform.vcs.impl.shared" />
-    <orderEntry type="module" module-name="intellij.platform.vcs.shared" />
-    <orderEntry type="module" module-name="intellij.platform.vcs.log" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" />
+    <orderEntry type="module" module-name="intellij.platform.ai.agent.core" />
+    <orderEntry type="module" module-name="intellij.agent.workbench.prompt.core" />
+    <orderEntry type="module" module-name="intellij.platform.ai.agent.sessions.core" />
+    <orderEntry type="module" module-name="intellij.agent.workbench.chat" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/agent-workbench/engine/resources/intellij.agent.workbench.engine.xml b/plugins/agent-workbench/engine/resources/intellij.agent.workbench.engine.xml
index 14fb3ecd72c7..0d1491ae3d8e 100644
--- a/plugins/agent-workbench/engine/resources/intellij.agent.workbench.engine.xml
+++ b/plugins/agent-workbench/engine/resources/intellij.agent.workbench.engine.xml
@@ -5,7 +5,7 @@
     <module name="intellij.platform.ai.agent.core"/>
     <module name="intellij.agent.workbench.prompt.core"/>
     <module name="intellij.platform.ai.agent.sessions.core"/>
-    <module name="intellij.agent.workbench.thread.view"/>
+    <module name="intellij.agent.workbench.chat"/>
   </dependencies>
 
   <extensionPoints>
@@ -23,6 +23,14 @@
       dynamic="true"/>
   </extensionPoints>
 
+  <extensions defaultExtensionNs="com.intellij">
+    <agent.workbench.sessionProvider
+      id="agentWorkbenchEngine"
+      implementation="com.intellij.agent.workbench.engine.ui.EngineSessionProviderDescriptor"/>
+    <agent.workbench.chatCustomContent
+      implementation="com.intellij.agent.workbench.engine.ui.EngineChatCustomContentProvider"/>
+  </extensions>
+
   <actions>
     <action
       id="Acp.RunMockThread"
diff --git a/plugins/agent-workbench/engine/src/ui/EngineSessionSource.kt b/plugins/agent-workbench/engine/src/ui/EngineSessionSource.kt
index 9a4e38705cb4..a106aa6a25ce 100644
--- a/plugins/agent-workbench/engine/src/ui/EngineSessionSource.kt
+++ b/plugins/agent-workbench/engine/src/ui/EngineSessionSource.kt
@@ -2,7 +2,6 @@
 package com.intellij.agent.workbench.engine.ui
 
 import com.intellij.platform.ai.agent.core.AgentThreadActivity
-import com.intellij.platform.ai.agent.core.AgentThreadActivityReport
 import com.intellij.platform.ai.agent.core.session.AgentSessionProvider
 import com.intellij.platform.ai.agent.core.session.AgentSessionOutlineItem
 import com.intellij.platform.ai.agent.core.session.AgentSessionOutlineItemKind
@@ -10,12 +9,8 @@ import com.intellij.platform.ai.agent.core.session.AgentSessionThread
 import com.intellij.platform.ai.agent.core.session.AgentSessionThreadOutline
 import com.intellij.platform.ai.agent.sessions.core.providers.AgentSessionSource
 import com.intellij.platform.ai.agent.sessions.core.providers.AgentSessionSourceUpdateEvent
-import com.intellij.platform.ai.agent.sessions.core.providers.AgentSessionThreadPresentationUpdate
-import com.intellij.platform.ai.agent.sessions.core.providers.AgentSessionThreadOutlineSource
-import com.intellij.platform.ai.agent.sessions.core.providers.AgentSessionUpdateSource
 import com.intellij.agent.workbench.engine.core.MessageRole
 import com.intellij.agent.workbench.engine.core.RuntimeKind
-import com.intellij.agent.workbench.engine.core.ThreadActionPrompt
 import com.intellij.agent.workbench.engine.core.ThreadCommand
 import com.intellij.agent.workbench.engine.core.ThreadContextCompaction
 import com.intellij.agent.workbench.engine.core.ThreadFileDiff
@@ -41,24 +36,24 @@ internal val ACP_PROVIDER: AgentSessionProvider = AgentSessionProvider.from("acp
  * Surfaces Engine threads as `AgentSessionThread`s in the existing Agent Workbench tool
  * window, so ACP/remote/mock runtimes appear alongside Claude/Codex without a separate UI.
  */
-internal class EngineSessionSource : AgentSessionSource, AgentSessionUpdateSource, AgentSessionThreadOutlineSource {
+internal class EngineSessionSource : AgentSessionSource {
   override val provider: AgentSessionProvider
     get() = ACP_PROVIDER
 
+  override val supportsUpdates: Boolean
+    get() = true
+
   override val updateEvents: Flow<AgentSessionSourceUpdateEvent>
-    get() = EngineChangeBus.changes.map { change ->
-      toSourceUpdateEvent(
-        store = EngineProjectService.storeForPath(change.projectPath),
-        projectPath = change.projectPath,
-        threadId = change.threadId,
-      )
+    get() = EngineChangeBus.changes.map {
+      AgentSessionSourceUpdateEvent.threadsChanged()
     }
 
-  override suspend fun listThreads(path: String, openProject: Project?): List<AgentSessionThread> {
-    if (openProject != null) {
-      val tracker = EngineUnreadTracker.getInstance(openProject)
-      return surfacedThreads(EngineProjectService.getInstance(openProject).eventStore) { tracker.isUnread(it) }
-    }
+  override suspend fun listThreadsFromOpenProject(path: String, project: Project): List<AgentSessionThread> {
+    val tracker = EngineUnreadTracker.getInstance(project)
+    return surfacedThreads(EngineProjectService.getInstance(project).eventStore) { tracker.isUnread(it) }
+  }
+
+  override suspend fun listThreadsFromClosedProject(path: String): List<AgentSessionThread> {
     // No project instance -> no live unread state; restored threads are never badged.
     return surfacedThreads(EngineProjectService.storeForPath(path)) { false }
   }
@@ -75,24 +70,6 @@ internal class EngineSessionSource : AgentSessionSource, AgentSessionUpdateSourc
       .map { toThread(it, unread(it.thread.id)) }
   }
 
-  private fun toSourceUpdateEvent(
-    store: EventStore,
-    projectPath: String,
-    threadId: ThreadId,
-  ): AgentSessionSourceUpdateEvent {
-    val projection = store.projection(threadId)
-    return AgentSessionSourceUpdateEvent.threadsChanged(
-      scopedPaths = setOf(projectPath),
-      threadIds = setOf(threadId.value),
-      presentationUpdatesByThreadId = mapOf(
-        threadId.value to AgentSessionThreadPresentationUpdate(
-          title = projection.thread.title.ifBlank { threadId.value },
-          updatedAt = projection.thread.updatedAt,
-        )
-      ),
-    )
-  }
-
   override suspend fun loadThreadOutline(path: String, threadId: String, subAgentId: String?): AgentSessionThreadOutline {
     val projection = EngineProjectService.storeForPath(path).projection(ThreadId(threadId))
     val items = projection.transcript.map { entry ->
@@ -120,7 +97,7 @@ internal class EngineSessionSource : AgentSessionSource, AgentSessionUpdateSourc
       updatedAt = thread.updatedAt,
       archived = false,
       // A live, unseen agent reply gets the attention badge; otherwise fall back to the status mapping.
-      activityReport = AgentThreadActivityReport(if (unread) AgentThreadActivity.NEEDS_INPUT else mapActivity(thread.status)),
+      activity = if (unread) AgentThreadActivity.NEEDS_INPUT else mapActivity(thread.status),
       provider = provider,
     )
   }
@@ -142,7 +119,7 @@ internal class EngineSessionSource : AgentSessionSource, AgentSessionUpdateSourc
       else -> AgentSessionOutlineItemKind.METADATA
     }
     is ThreadToolCall, is ThreadCommand -> AgentSessionOutlineItemKind.TOOL_CALL
-    is ThreadPlan, is ThreadFileDiff, is ThreadContextCompaction, is ThreadActionPrompt -> AgentSessionOutlineItemKind.METADATA
+    is ThreadPlan, is ThreadFileDiff, is ThreadContextCompaction -> AgentSessionOutlineItemKind.METADATA
   }
 
   private fun outlineTitle(entry: ThreadTranscriptEntry): String = when (entry) {
@@ -152,7 +129,6 @@ internal class EngineSessionSource : AgentSessionSource, AgentSessionUpdateSourc
     is ThreadPlan -> entry.title ?: entry.id
     is ThreadFileDiff -> entry.title ?: entry.path ?: entry.id
     is ThreadContextCompaction -> entry.title ?: entry.id
-    is ThreadActionPrompt -> entry.title
   }
 
   private fun outlinePreview(entry: ThreadTranscriptEntry): String = when (entry) {
@@ -162,6 +138,5 @@ internal class EngineSessionSource : AgentSessionSource, AgentSessionUpdateSourc
     is ThreadPlan -> entry.items.joinToString(separator = "\n") { it.title }
     is ThreadFileDiff -> entry.newText.orEmpty()
     is ThreadContextCompaction -> entry.summary.orEmpty()
-    is ThreadActionPrompt -> entry.message ?: entry.buttons.joinToString(separator = "\n") { it.text }
   }
 }
diff --git a/plugins/agent-workbench/plugin/plugin-content.yaml b/plugins/agent-workbench/plugin/plugin-content.yaml
index 3a8916db4fe7..9595affca83b 100644
--- a/plugins/agent-workbench/plugin/plugin-content.yaml
+++ b/plugins/agent-workbench/plugin/plugin-content.yaml
@@ -1,6 +1,12 @@
 - name: lib/agent-workbench-plugin.jar
   modules:
   - name: intellij.agent.workbench.plugin
+- name: lib/modules/intellij.agent.workbench.acp.jar
+  contentModules:
+  - name: intellij.agent.workbench.acp
+- name: lib/modules/intellij.agent.workbench.acp.runtime.jar
+  contentModules:
+  - name: intellij.agent.workbench.acp.runtime
 - name: lib/modules/intellij.agent.workbench.ai.code.review.integration.jar
   contentModules:
   - name: intellij.agent.workbench.ai.code.review.integration
@@ -47,6 +53,9 @@
   - name: $MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-server-jvm/0/kotlin-sdk-server-jvm-0.jar
   - name: $MAVEN_REPOSITORY$/io/modelcontextprotocol/kotlin-sdk-core-jvm/0/kotlin-sdk-core-jvm-0.jar
   reason: <- intellij.agent.workbench.container.mcp
+- name: lib/modules/intellij.agent.workbench.engine.jar
+  contentModules:
+  - name: intellij.agent.workbench.engine
 - name: lib/modules/intellij.agent.workbench.pi.awb.jar
   contentModules:
   - name: intellij.agent.workbench.pi.awb