Skip to content

feat(idea): ACP client integration (stdio) #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phodal merged 1 commit into from
Feb 4, 2026
Merged

feat(idea): ACP client integration (stdio) #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions mpp-idea/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,6 +396,23 @@ project(":") {
// Note: We use Dispatchers.EDT from IntelliJ Platform instead of Dispatchers.Swing
compileOnly("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")

// ===== ACP (Agent Client Protocol) =====
// Local ACP agent integration uses JSON-RPC over stdio.
// Exclude kotlinx deps to avoid conflicts with IntelliJ's bundled versions.
implementation("com.agentclientprotocol:acp:0.10.5") {
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core")
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-coroutines-core-jvm")
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json")
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-json-jvm")
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-core")
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-serialization-core-jvm")
// We provide kotlinx-io explicitly below.
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-io-core")
exclude(group = "org.jetbrains.kotlinx", module = "kotlinx-io-core-jvm")
}
// ACP stdio transport uses kotlinx-io (not bundled by IntelliJ).
implementation("org.jetbrains.kotlinx:kotlinx-io-core:0.8.0")

// mpp-core dependency for root project - use published artifact
implementation("cc.unitmesh:mpp-core:${prop("mppVersion")}") {
// Exclude Compose dependencies from mpp-core as well
Expand Down
18 changes: 18 additions & 0 deletions mpp-idea/mpp-idea-core/src/main/kotlin/cc/unitmesh/devti/settings/AutoDevSettingsState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,24 @@ import com.intellij.util.xmlb.XmlSerializerUtil
class AutoDevSettingsState : PersistentStateComponent<AutoDevSettingsState> {
var delaySeconds = ""

// ===== ACP (Agent Client Protocol) integration =====
/**
* ACP agent command to run (local process).
* Example: `node`, `python`, `autodev-agent`, etc.
*/
var acpCommand = ""

/**
* ACP agent args as a single string (will be parsed into argv).
* Example: `path/to/agent.js --stdio`.
*/
var acpArgs = ""

/**
* ACP agent environment variables in "KEY=VALUE" lines.
*/
var acpEnv = ""

// Legacy fields - kept for backward compatibility but deprecated
@Deprecated("Use defaultModelId instead")
var customOpenAiHost = ""
Expand Down
123 changes: 89 additions & 34 deletions mpp-idea/src/main/kotlin/cc/unitmesh/devins/idea/toolwindow/IdeaAgentApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,14 @@ import cc.unitmesh.devins.idea.toolwindow.codereview.IdeaCodeReviewContent
import cc.unitmesh.devins.idea.toolwindow.codereview.IdeaCodeReviewViewModel
import cc.unitmesh.devins.idea.components.header.IdeaAgentTabsHeader
import cc.unitmesh.devins.idea.components.IdeaVerticalResizableSplitPane
import cc.unitmesh.devins.idea.toolwindow.acp.IdeaAcpAgentContent
import cc.unitmesh.devins.idea.toolwindow.acp.IdeaAcpAgentViewModel
import cc.unitmesh.devins.idea.toolwindow.knowledge.IdeaKnowledgeContent
import cc.unitmesh.devins.idea.toolwindow.knowledge.IdeaKnowledgeViewModel
import cc.unitmesh.devins.idea.toolwindow.remote.IdeaRemoteAgentContent
import cc.unitmesh.devins.idea.toolwindow.remote.IdeaRemoteAgentViewModel
import cc.unitmesh.devins.idea.toolwindow.remote.IdeaRemoteModeSelector
import cc.unitmesh.devins.idea.toolwindow.remote.RemoteAgentMode
import cc.unitmesh.devins.idea.toolwindow.remote.getEffectiveProjectId
import cc.unitmesh.devins.idea.toolwindow.webedit.IdeaWebEditContent
import cc.unitmesh.devins.idea.toolwindow.webedit.IdeaWebEditViewModel
Expand Down Expand Up @@ -130,6 +134,9 @@ fun IdeaAgentApp(
// Remote Agent ViewModel (created lazily when needed)
var remoteAgentViewModel by remember { mutableStateOf<IdeaRemoteAgentViewModel?>(null) }

// ACP Agent ViewModel (created lazily when needed)
var acpAgentViewModel by remember { mutableStateOf<IdeaAcpAgentViewModel?>(null) }

// WebEdit ViewModel (created lazily when needed)
var webEditViewModel by remember { mutableStateOf<IdeaWebEditViewModel?>(null) }

Expand Down Expand Up @@ -164,30 +171,28 @@ fun IdeaAgentApp(
serverUrl = "http://localhost:8080"
)
}
if (currentAgentType == AgentType.REMOTE && acpAgentViewModel == null) {
acpAgentViewModel = IdeaAcpAgentViewModel(project, coroutineScope)
}
if (currentAgentType == AgentType.WEB_EDIT && webEditViewModel == null) {
webEditViewModel = IdeaWebEditViewModel(project, coroutineScope)
}
}

// Dispose ViewModels when leaving their tabs
DisposableEffect(currentAgentType) {
// Dispose ViewModels when the tool window is disposed.
// Keeping them alive across tab switches avoids reconnect churn and prevents leaks.
DisposableEffect(Unit) {
onDispose {
if (currentAgentType != AgentType.CODE_REVIEW) {
codeReviewViewModel?.dispose()
codeReviewViewModel = null
}
if (currentAgentType != AgentType.KNOWLEDGE) {
knowledgeViewModel?.dispose()
knowledgeViewModel = null
}
if (currentAgentType != AgentType.REMOTE) {
remoteAgentViewModel?.dispose()
remoteAgentViewModel = null
}
if (currentAgentType != AgentType.WEB_EDIT) {
webEditViewModel?.dispose()
webEditViewModel = null
}
codeReviewViewModel?.dispose()
knowledgeViewModel?.dispose()
remoteAgentViewModel?.dispose()
acpAgentViewModel?.dispose()
webEditViewModel?.dispose()
codeReviewViewModel = null
knowledgeViewModel = null
remoteAgentViewModel = null
acpAgentViewModel = null
webEditViewModel = null
}
}

Expand Down Expand Up @@ -306,41 +311,89 @@ fun IdeaAgentApp(
)
}
AgentType.REMOTE -> {
remoteAgentViewModel?.let { remoteVm ->
// Use manual state collection for remote agent states
val remoteVm = remoteAgentViewModel
val acpVm = acpAgentViewModel
if (remoteVm != null && acpVm != null) {
var remoteMode by remember { mutableStateOf(RemoteAgentMode.SERVER) }
var remoteIsExecuting by remember { mutableStateOf(false) }
var acpIsExecuting by remember { mutableStateOf(false) }

IdeaLaunchedEffect(remoteVm, project = project) {
remoteVm.isExecuting.collect { remoteIsExecuting = it }
}
IdeaLaunchedEffect(acpVm, project = project) {
acpVm.isExecuting.collect { acpIsExecuting = it }
}

val isRemoteProcessing = remoteMode == RemoteAgentMode.SERVER && remoteIsExecuting
val isAcpProcessing = remoteMode == RemoteAgentMode.ACP && acpIsExecuting

IdeaVerticalResizableSplitPane(
modifier = Modifier.fillMaxWidth().weight(1f),
initialSplitRatio = 0.75f,
minRatio = 0.3f,
maxRatio = 0.9f,
top = {
IdeaRemoteAgentContent(
viewModel = remoteVm,
listState = listState,
onProjectIdChange = { remoteProjectId = it },
onGitUrlChange = { remoteGitUrl = it }
)
Column(modifier = Modifier.fillMaxSize()) {
Row(
modifier = Modifier
.fillMaxWidth()
.padding(horizontal = 12.dp, vertical = 8.dp),
horizontalArrangement = Arrangement.Start
) {
IdeaRemoteModeSelector(
mode = remoteMode,
onModeChange = { remoteMode = it }
)
}
Divider(Orientation.Horizontal, modifier = Modifier.fillMaxWidth().height(1.dp))

when (remoteMode) {
RemoteAgentMode.SERVER -> {
IdeaRemoteAgentContent(
viewModel = remoteVm,
listState = listState,
onProjectIdChange = { remoteProjectId = it },
onGitUrlChange = { remoteGitUrl = it },
modifier = Modifier.fillMaxSize()
)
}
RemoteAgentMode.ACP -> {
IdeaAcpAgentContent(
viewModel = acpVm,
listState = listState,
modifier = Modifier.fillMaxSize()
)
}
}
}
},
bottom = {
IdeaDevInInputArea(
project = project,
parentDisposable = viewModel,
isProcessing = remoteIsExecuting,
isProcessing = isRemoteProcessing || isAcpProcessing,
onSend = { task ->
val effectiveProjectId = getEffectiveProjectId(remoteProjectId, remoteGitUrl)
if (effectiveProjectId.isNotBlank()) {
remoteVm.executeTask(effectiveProjectId, task, remoteGitUrl)
} else {
remoteVm.renderer.renderError("Please provide a project or Git URL")
when (remoteMode) {
RemoteAgentMode.SERVER -> {
val effectiveProjectId = getEffectiveProjectId(remoteProjectId, remoteGitUrl)
if (effectiveProjectId.isNotBlank()) {
remoteVm.executeTask(effectiveProjectId, task, remoteGitUrl)
} else {
remoteVm.renderer.renderError("Please provide a project or Git URL")
}
}
RemoteAgentMode.ACP -> {
acpVm.sendMessage(task)
}
}
},
onAbort = {
when (remoteMode) {
RemoteAgentMode.SERVER -> remoteVm.cancelTask()
RemoteAgentMode.ACP -> acpVm.cancelTask()
}
},
onAbort = { remoteVm.cancelTask() },
workspacePath = project.basePath,
totalTokens = null,
onAtClick = {},
Expand All @@ -355,7 +408,9 @@ fun IdeaAgentApp(
)
}
)
} ?: IdeaEmptyStateMessage("Loading Remote Agent...")
} else {
IdeaEmptyStateMessage("Loading Remote Agent...")
}
}
AgentType.CODE_REVIEW -> {
Box(modifier = Modifier.fillMaxWidth().weight(1f)) {
Expand Down
Loading
Loading