diff --git a/desktop/capabilities/default.json b/desktop/capabilities/default.json
index 8c82d236a..e105b04b1 100644
--- a/desktop/capabilities/default.json
+++ b/desktop/capabilities/default.json
@@ -22,7 +22,7 @@
     {
       "identifier": "shell:allow-spawn",
       "allow": [
-        { "name": "claude-code-acp", "cmd": "claude-code-acp", "args": true },
+        { "name": "claude-agent-acp", "cmd": "claude-agent-acp", "args": true },
         { "name": "codex-acp", "cmd": "codex-acp", "args": true },
         { "name": "gemini", "cmd": "gemini", "args": true },
         { "name": "openpencil-mcp", "cmd": "openpencil-mcp", "args": true }
diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.ts
index c5da27715..82dd5d6dd 100644
--- a/packages/core/src/constants.ts
+++ b/packages/core/src/constants.ts
@@ -99,7 +99,7 @@ export interface ACPAgentDef {
 }
 
 export const ACP_AGENTS: ACPAgentDef[] = [
-  { id: 'claude-code', name: 'Claude Code', command: 'claude-code-acp', args: [] },
+  { id: 'claude-code', name: 'Claude Code', command: 'claude-agent-acp', args: [] },
   { id: 'codex', name: 'Codex', command: 'codex-acp', args: [] },
   { id: 'gemini-cli', name: 'Gemini CLI', command: 'gemini', args: ['--acp'] }
 ]
diff --git a/src/ai/acp-transport.ts b/src/ai/acp-transport.ts
index c0ba5e12f..1c6c340a9 100644
--- a/src/ai/acp-transport.ts
+++ b/src/ai/acp-transport.ts
@@ -157,7 +157,6 @@ export class ACPChatTransport implements ChatTransport<UIMessage> {
   }
 
   private async spawnAgent(): Promise<ACPSession> {
-    // @ts-expect-error — Tauri runtime-only module, not resolvable in lint/test environments
     const { Command } = await import('@tauri-apps/plugin-shell')
 
     const command = Command.create(this.agentDef.command, this.agentDef.args, {
diff --git a/src/automation/spawn-mcp.ts b/src/automation/spawn-mcp.ts
index 4fa254377..8b3291b53 100644
--- a/src/automation/spawn-mcp.ts
+++ b/src/automation/spawn-mcp.ts
@@ -24,7 +24,6 @@ export async function spawnMcpIfNeeded(): Promise<(() => void) | null> {
 
   if (await checkHealth()) return null
 
-  // @ts-expect-error — Tauri runtime-only module, not resolvable in lint/test environments
   const { Command } = await import('@tauri-apps/plugin-shell')
   const command = Command.create('openpencil-mcp', [])