From 230afdcf6adb189e49d9122b9701d476a97b8489 Mon Sep 17 00:00:00 2001
From: Aiden Cline <aidenpcline@gmail.com>
Date: Fri, 7 Nov 2025 11:47:24 -0600
Subject: [PATCH] wip

---
 packages/opencode/src/acp/agent.ts | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/packages/opencode/src/acp/agent.ts b/packages/opencode/src/acp/agent.ts
index d532a43b6..f1c3a6c50 100644
--- a/packages/opencode/src/acp/agent.ts
+++ b/packages/opencode/src/acp/agent.ts
@@ -414,6 +414,7 @@ export namespace ACP {
     }
 
     async loadSession(params: LoadSessionRequest) {
+      const directory = params.cwd
       const model = await defaultModel(this.config)
       const sessionId = params.sessionId
 
@@ -433,7 +434,25 @@ export namespace ACP {
         }))
       })
 
-      const availableCommands = (await Command.list()).map((command) => ({
+      const agents = await this.config.sdk.app
+        .agents({
+          throwOnError: true,
+          query: {
+            directory,
+          },
+        })
+        .then((resp) => resp.data)
+
+      const commands = await this.config.sdk.command
+        .list({
+          throwOnError: true,
+          query: {
+            directory,
+          },
+        })
+        .then((resp) => resp.data)
+
+      const availableCommands = commands.map((command) => ({
         name: command.name,
         description: command.description ?? "",
       }))
@@ -444,7 +463,7 @@ export namespace ACP {
           description: "compact the session",
         })
 
-      const availableModes = (await Agents.list())
+      const availableModes = agents
         .filter((agent) => agent.mode !== "subagent")
         .map((agent) => ({
           id: agent.name,