diff --git a/platform/problemsView/backend/intellij.aiCodeReview.ui.backend.tests.iml b/platform/problemsView/backend/intellij.aiCodeReview.ui.backend.tests.iml
new file mode 100644
index 000000000000..f4a402831838
--- /dev/null
+++ b/platform/problemsView/backend/intellij.aiCodeReview.ui.backend.tests.iml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/testSrc">
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" packagePrefix="com.intellij.aiCodeReview.ui" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.ui.backend" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.ui.shared" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.api" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.backend" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.collaborationTools" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ui" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.editor.ex" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.core.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.diff" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.util.coroutines" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.markdown" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.junit5" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.junit4" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.test" scope="TEST" />
+  </component>
+  <component name="TestModuleProperties" production-module="intellij.aiCodeReview.ui.backend" />
+</module>
\ No newline at end of file
diff --git a/platform/problemsView/backend/intellij.platform.problemsView.backend.iml b/platform/problemsView/backend/intellij.platform.problemsView.backend.iml
index b5f25ba9dbd4..3bcbaf68a4ca 100644
--- a/platform/problemsView/backend/intellij.platform.problemsView.backend.iml
+++ b/platform/problemsView/backend/intellij.platform.problemsView.backend.iml
@@ -9,14 +9,12 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="25" />
-            <stringArg name="apiVersion" arg="2.4" />
-            <stringArg name="languageVersion" arg="2.4" />
+            <stringArg name="apiVersion" arg="2.3" />
+            <stringArg name="languageVersion" arg="2.3" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
-              <args>
-                <arg>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</arg>
-              </args>
+              <args>$KOTLIN_BUNDLED$/lib/kotlinx-serialization-compiler-plugin.jar</args>
             </arrayArg>
           </arrayArguments>
         </compilerArguments>
@@ -31,34 +29,33 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module" module-name="intellij.platform.kernel" />
     <orderEntry type="library" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
-    <orderEntry type="module" module-name="intellij.platform.problemsView.shared" />
-    <orderEntry type="module" module-name="intellij.platform.core" />
-    <orderEntry type="module" module-name="intellij.platform.core.ui" />
+    <orderEntry type="module" module-name="intellij.platform.backend" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.ui.shared" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.api" />
+    <orderEntry type="module" module-name="intellij.platform.collaborationTools" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="module" module-name="intellij.platform.util.ui" />
-    <orderEntry type="module" module-name="intellij.platform.ide" />
-    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
-    <orderEntry type="module" module-name="intellij.platform.ide.core" />
-    <orderEntry type="module" module-name="intellij.platform.ide.rpc" />
-    <orderEntry type="module" module-name="intellij.platform.analysis" />
-    <orderEntry type="module" module-name="intellij.platform.analysis.impl" />
-    <orderEntry type="module" module-name="intellij.platform.lang" />
-    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
-    <orderEntry type="module" module-name="intellij.platform.editor" />
+    <orderEntry type="module" module-name="intellij.platform.core" />
+    <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.editor.ex" />
-    <orderEntry type="module" module-name="intellij.platform.projectModel" />
-    <orderEntry type="module" module-name="intellij.platform.backend" />
-    <orderEntry type="module" module-name="fleet.rpc" />
-    <orderEntry type="module" module-name="intellij.platform.project" />
-    <orderEntry type="module" module-name="intellij.platform.rpc.backend" />
-    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
-    <orderEntry type="module" module-name="intellij.platform.concurrency" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.icons" />
+    <orderEntry type="module" module-name="intellij.platform.ide" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" />
+    <orderEntry type="module" module-name="intellij.platform.ide.impl" />
     <orderEntry type="module" module-name="intellij.platform.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core.impl" />
+    <orderEntry type="module" module-name="intellij.platform.lang" />
+    <orderEntry type="module" module-name="intellij.platform.lang.impl" />
+    <orderEntry type="module" module-name="intellij.platform.indexing" />
+    <orderEntry type="module" module-name="intellij.platform.projectModel" />
+    <orderEntry type="module" module-name="intellij.platform.diff" />
+    <orderEntry type="module" module-name="intellij.platform.diff.impl" />
+    <orderEntry type="module" module-name="intellij.platform.util.diff" />
+    <orderEntry type="module" module-name="intellij.platform.util.coroutines" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
+    <orderEntry type="module" module-name="intellij.libraries.markdown" />
   </component>
 </module>
\ No newline at end of file
diff --git a/plugins/agent-workbench/plugin/plugin-content.yaml b/plugins/agent-workbench/plugin/plugin-content.yaml
index a5cea8d23df8..3a8916db4fe7 100644
--- a/plugins/agent-workbench/plugin/plugin-content.yaml
+++ b/plugins/agent-workbench/plugin/plugin-content.yaml
@@ -1,27 +1,9 @@
 - name: lib/agent-workbench-plugin.jar
   modules:
   - name: intellij.agent.workbench.plugin
-- name: lib/modules/intellij.agent.workbench.acp.jar
+- name: lib/modules/intellij.agent.workbench.ai.code.review.integration.jar
   contentModules:
-  - name: intellij.agent.workbench.acp
-- name: lib/modules/intellij.agent.workbench.acp.runtime.jar
-  projectLibraries:
-  - name: agentclientprotocol.acp.jvm
-    files:
-    - name: $MAVEN_REPOSITORY$/com/agentclientprotocol/acp-jvm/0/acp-jvm-0.jar
-    - name: $MAVEN_REPOSITORY$/com/agentclientprotocol/acp-model-jvm/0/acp-model-jvm-0.jar
-    - name: $MAVEN_REPOSITORY$/org/jetbrains/kotlinx/atomicfu-jvm/0/atomicfu-jvm-0.jar
-    reason: <- intellij.agent.workbench.acp.runtime
-  - name: agentclientprotocol.acp.ktor
-    files:
-    - name: $MAVEN_REPOSITORY$/com/agentclientprotocol/acp-ktor-jvm/0/acp-ktor-jvm-0.jar
-    reason: <- intellij.agent.workbench.acp.runtime
-  - name: io.github.oshai.kotlin.logging.jvm
-    files:
-    - name: $MAVEN_REPOSITORY$/io/github/oshai/kotlin-logging-jvm/7/kotlin-logging-jvm-7.jar
-    reason: <- intellij.agent.workbench.acp.runtime
-  contentModules:
-  - name: intellij.agent.workbench.acp.runtime
+  - name: intellij.agent.workbench.ai.code.review.integration
 - name: lib/modules/intellij.agent.workbench.ai.review.agents.jar
   contentModules:
   - name: intellij.agent.workbench.ai.review.agents
@@ -34,18 +16,21 @@
 - name: lib/modules/intellij.agent.workbench.ai.review.space.jar
   contentModules:
   - name: intellij.agent.workbench.ai.review.space
+- name: lib/modules/intellij.agent.workbench.chat.jar
+  contentModules:
+  - name: intellij.agent.workbench.chat
 - name: lib/modules/intellij.agent.workbench.claude.awb.jar
   contentModules:
   - name: intellij.agent.workbench.claude.awb
+- name: lib/modules/intellij.agent.workbench.codex.chat.jar
+  contentModules:
+  - name: intellij.agent.workbench.codex.chat
 - name: lib/modules/intellij.agent.workbench.codex.ide.jar
   contentModules:
   - name: intellij.agent.workbench.codex.ide
 - name: lib/modules/intellij.agent.workbench.codex.prompt.suggestions.jar
   contentModules:
   - name: intellij.agent.workbench.codex.prompt.suggestions
-- name: lib/modules/intellij.agent.workbench.codex.thread.view.jar
-  contentModules:
-  - name: intellij.agent.workbench.codex.thread.view
 - name: lib/modules/intellij.agent.workbench.container.eel.jar
   contentModules:
   - name: intellij.agent.workbench.container.eel
@@ -62,9 +47,6 @@
   - 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
@@ -101,18 +83,12 @@
 - name: lib/modules/intellij.agent.workbench.sessions.launch.config.backend.jar
   contentModules:
   - name: intellij.agent.workbench.sessions.launch.config.backend
-- name: lib/modules/intellij.agent.workbench.sessions.task.folders.jar
-  contentModules:
-  - name: intellij.agent.workbench.sessions.task.folders
 - name: lib/modules/intellij.agent.workbench.sessions.toolwindow.jar
   contentModules:
   - name: intellij.agent.workbench.sessions.toolwindow
 - name: lib/modules/intellij.agent.workbench.settings.jar
   contentModules:
   - name: intellij.agent.workbench.settings
-- name: lib/modules/intellij.agent.workbench.thread.view.jar
-  contentModules:
-  - name: intellij.agent.workbench.thread.view
 - name: lib/modules/intellij.agent.workbench.ui.jar
   contentModules:
   - name: intellij.agent.workbench.ui
diff --git a/plugins/agent-workbench/sessions-task-folders/intellij.agent.workbench.sessions.task.folders.tests.iml b/plugins/agent-workbench/sessions-task-folders/intellij.agent.workbench.sessions.task.folders.tests.iml
index a0eb3a65c1a5..607c2abd6baf 100644
--- a/plugins/agent-workbench/sessions-task-folders/intellij.agent.workbench.sessions.task.folders.tests.iml
+++ b/plugins/agent-workbench/sessions-task-folders/intellij.agent.workbench.sessions.task.folders.tests.iml
@@ -9,8 +9,8 @@
         <compilerArguments>
           <stringArguments>
             <stringArg name="jvmTarget" arg="25" />
-            <stringArg name="apiVersion" arg="2.4" />
-            <stringArg name="languageVersion" arg="2.4" />
+            <stringArg name="apiVersion" arg="2.3" />
+            <stringArg name="languageVersion" arg="2.3" />
           </stringArguments>
           <arrayArguments>
             <arrayArg name="pluginClasspaths">
@@ -24,22 +24,27 @@
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/testSrc">
-      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" packagePrefix="com.intellij.agent.workbench.sessions.task.folders" />
+      <sourceFolder url="file://$MODULE_DIR$/testSrc" isTestSource="true" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" scope="TEST" name="kotlin-stdlib" level="project" />
-    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.api" />
+    <orderEntry type="module" module-name="intellij.aiCodeReview.vcs" />
     <orderEntry type="module" module-name="intellij.platform.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.analysis" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.ide.core" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.projectModel" scope="TEST" />
     <orderEntry type="module" module-name="intellij.platform.util" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.util.ex" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.ai.agent.core" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.libraries.junit5" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.vcs" scope="TEST" />
+    <orderEntry type="library" name="kotlin-stdlib" level="project" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.core" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.serialization.json" />
+    <orderEntry type="library" scope="TEST" name="JUnit5" level="project" />
     <orderEntry type="module" module-name="intellij.platform.testFramework.junit5" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.libraries.assertj.core" scope="TEST" />
-    <orderEntry type="module" module-name="intellij.agent.workbench.sessions.task.folders" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.platform.testFramework.core" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.core" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlinx.coroutines.test" scope="TEST" />
+    <orderEntry type="module" module-name="intellij.libraries.kotlin.reflect" scope="TEST" />
   </component>
-  <component name="TestModuleProperties" production-module="intellij.agent.workbench.sessions.task.folders" />
 </module>
\ No newline at end of file