refactor ACP tools

take PR feedback into account:
- Import existing tools and only modify `execute()`
- No prompt change needed, reads, edits, and writes are executed as-is
with a different interface
- Keep permissions

refactor ACP tools

Author: haoxiangliew

packages/opencode/src/acp/agent.ts

@@ -42,8 +42,6 @@ import { MCP } from "@/mcp"
 import { Todo } from "@/session/todo"
 import { z } from "zod"
 import { LoadAPIKeyError } from "ai"
-import { createACPTools } from "./tools"
-import { ToolRegistry } from "../tool/registry"
 
 export namespace ACP {
   const log = Log.create({ service: "acp-agent" })
@@ -470,14 +468,6 @@ export namespace ACP {
         }
       }
 
-      if (this.clientCapabilities?.fs?.writeTextFile) {
-        log.info("Client has writeTextFile capability, registering ACP tools")
-        const acpTools = createACPTools(this, sessionId)
-        for (const tool of acpTools) {
-          await ToolRegistry.register(tool)
-        }
-      }
-
       await Promise.all(
         Object.entries(mcpServers).map(async ([key, mcp]) => {
           await MCP.add(key, mcp)
@@ -619,13 +609,6 @@ export namespace ACP {
       }
 
       if (!cmd) {
-        const tools = acpSession.hasACPTools
-          ? {
-              edit: false,
-              write: false,
-              read: false,
-            }
-          : undefined
         await SessionPrompt.prompt({
           sessionID,
           model: {
@@ -634,7 +617,7 @@ export namespace ACP {
           },
           parts,
           agent,
-          tools,
+          acpAgent: acpSession.hasACPTools ? this : undefined,
         })
         return done
       }

packages/opencode/src/acp/tools.ts

@@ -9,6 +9,7 @@ import { SessionRevert } from "./revert"
 import { Session } from "."
 import { Agent } from "../agent/agent"
 import { Provider } from "../provider/provider"
+import type { ACP } from "../acp/agent"
 import {
   generateText,
   streamText,
@@ -109,6 +110,7 @@ export namespace SessionPrompt {
     noReply: z.boolean().optional(),
     system: z.string().optional(),
     tools: z.record(z.string(), z.boolean()).optional(),
+    acpAgent: z.custom<ACP.Agent>().optional(),
     parts: z.array(
       z.discriminatedUnion("type", [
         MessageV2.TextPart.omit({
@@ -192,6 +194,7 @@ export namespace SessionPrompt {
       agent: agent.name,
       system,
       abort: abort.signal,
+      acpAgent: input.acpAgent,
     })
 
     const tools = await resolveTools({
@@ -201,6 +204,7 @@ export namespace SessionPrompt {
       providerID: model.providerID,
       tools: input.tools,
       processor,
+      acpAgent: input.acpAgent,
     })
 
     const params = await Plugin.trigger(
@@ -518,6 +522,7 @@ export namespace SessionPrompt {
     providerID: string
     tools?: Record<string, boolean>
     processor: Processor
+    acpAgent?: ACP.Agent
   }) {
     const tools: Record<string, AITool> = {}
     const enabledTools = pipe(
@@ -556,6 +561,7 @@ export namespace SessionPrompt {
             extra: {
               modelID: input.modelID,
               providerID: input.providerID,
+              acpAgent: input.acpAgent,
             },
             agent: input.agent.name,
             metadata: async (val) => {
@@ -951,6 +957,7 @@ export namespace SessionPrompt {
     system: string[]
     agent: string
     abort: AbortSignal
+    acpAgent?: ACP.Agent
   }) {
     const toolcalls: Record<string, MessageV2.ToolPart> = {}
     let snapshot: string | undefined