WIP

as-cii · as-cii · commit 3b2e049cb359 · 2025-08-29T11:50:06.000+02:00
diff --git a/docs/protocol/schema.mdx b/docs/protocol/schema.mdx
@@ -92,7 +92,7 @@ See protocol docs: [Initialization](https://agentclientprotocol.com/protocol/ini
 <ResponseField name="agentCapabilities" type={<a href="#agentcapabilities">AgentCapabilities</a>} >
   Capabilities supported by the agent.
 
-    - Default: `{"loadSession":false,"promptCapabilities":{"audio":false,"embeddedContext":false,"image":false,"supportsCustomCommands":false}}`
+    - Default: `{"loadSession":false,"promptCapabilities":{"audio":false,"embeddedContext":false,"image":false,"supportsCommands":false}}`
 
 </ResponseField>
 <ResponseField name="authMethods" type={<><span><a href="#authmethod">AuthMethod</a></span><span>[]</span></>} >
@@ -616,7 +616,7 @@ See protocol docs: [Agent Capabilities](https://agentclientprotocol.com/protocol
 <ResponseField name="promptCapabilities" type={<a href="#promptcapabilities">PromptCapabilities</a>} >
   Prompt capabilities supported by the agent.
 
-    - Default: `{"audio":false,"embeddedContext":false,"image":false,"supportsCustomCommands":false}`
+    - Default: `{"audio":false,"embeddedContext":false,"image":false,"supportsCommands":false}`
 
 </ResponseField>
 
@@ -1247,8 +1247,8 @@ in prompt requests for pieces of context that are referenced in the message.
     - Default: `false`
 
 </ResponseField>
-<ResponseField name="supportsCustomCommands" type={"boolean"} >
-  Agent supports custom slash commands via `list_commands` and `run_command`.
+<ResponseField name="supportsCommands" type={"boolean"} >
+  Agent supports commands via `list_commands` and `run_command`.
 
     - Default: `false`
 
diff --git a/rust/agent.rs b/rust/agent.rs
@@ -383,9 +383,9 @@ pub struct PromptCapabilities {
     /// in prompt requests for pieces of context that are referenced in the message.
     #[serde(default)]
     pub embedded_context: bool,
-    /// Agent supports custom slash commands via `list_commands` and `run_command`.
+    /// Agent supports commands via `list_commands` and `run_command`.
     #[serde(default)]
-    pub supports_custom_commands: bool,
+    pub supports_commands: bool,
 }
 
 // Slash commands
@@ -452,6 +452,10 @@ pub struct AgentMethodNames {
     pub session_prompt: &'static str,
     /// Notification for cancelling operations.
     pub session_cancel: &'static str,
+    /// Method for listing available commands.
+    pub session_list_commands: &'static str,
+    /// Method for running a command.
+    pub session_run_command: &'static str,
 }
 
 /// Constant containing all agent method names.
@@ -462,6 +466,8 @@ pub const AGENT_METHOD_NAMES: AgentMethodNames = AgentMethodNames {
     session_load: SESSION_LOAD_METHOD_NAME,
     session_prompt: SESSION_PROMPT_METHOD_NAME,
     session_cancel: SESSION_CANCEL_METHOD_NAME,
+    session_list_commands: SESSION_LIST_COMMANDS,
+    session_run_command: SESSION_RUN_COMMAND,
 };
 
 /// Method name for the initialize request.
@@ -478,7 +484,7 @@ pub(crate) const SESSION_PROMPT_METHOD_NAME: &str = "session/prompt";
 pub(crate) const SESSION_CANCEL_METHOD_NAME: &str = "session/cancel";
 /// Method name for listing custom commands in a session.
 pub const SESSION_LIST_COMMANDS: &str = "session/list_commands";
-/// Method name for running a custom command in a session.  
+/// Method name for running a custom command in a session.
 pub const SESSION_RUN_COMMAND: &str = "session/run_command";
 
 /// All possible requests that a client can send to an agent.
diff --git a/schema/meta.json b/schema/meta.json
@@ -3,9 +3,11 @@
     "authenticate": "authenticate",
     "initialize": "initialize",
     "session_cancel": "session/cancel",
+    "session_list_commands": "session/list_commands",
     "session_load": "session/load",
     "session_new": "session/new",
-    "session_prompt": "session/prompt"
+    "session_prompt": "session/prompt",
+    "session_run_command": "session/run_command"
   },
   "clientMethods": {
     "fs_read_text_file": "fs/read_text_file",
diff --git a/schema/schema.json b/schema/schema.json
@@ -14,7 +14,7 @@
             "audio": false,
             "embeddedContext": false,
             "image": false,
-            "supportsCustomCommands": false
+            "supportsCommands": false
           },
           "description": "Prompt capabilities supported by the agent."
         }
@@ -636,7 +636,7 @@
               "audio": false,
               "embeddedContext": false,
               "image": false,
-              "supportsCustomCommands": false
+              "supportsCommands": false
             }
           },
           "description": "Capabilities supported by the agent."
@@ -913,9 +913,9 @@
           "description": "Agent supports [`ContentBlock::Image`].",
           "type": "boolean"
         },
-        "supportsCustomCommands": {
+        "supportsCommands": {
           "default": false,
-          "description": "Agent supports custom slash commands via `list_commands` and `run_command`.",
+          "description": "Agent supports commands via `list_commands` and `run_command`.",
           "type": "boolean"
         }
       },
diff --git a/typescript/acp.test.ts b/typescript/acp.test.ts
@@ -24,6 +24,9 @@ import {
   CancelNotification,
   SessionNotification,
   PROTOCOL_VERSION,
+  ListCommandsRequest,
+  ListCommandsResponse,
+  RunCommandRequest,
 } from "./acp.js";
 
 describe("Connection", () => {
@@ -78,6 +81,14 @@ describe("Connection", () => {
       async cancel(_: CancelNotification): Promise<void> {
         // no-op
       }
+      async listCommands(
+        _: ListCommandsRequest,
+      ): Promise<ListCommandsResponse> {
+        throw new Error("not implemented");
+      }
+      async runCommand(_: RunCommandRequest): Promise<void> {
+        throw new Error("not implemented");
+      }
     }
 
     // Set up connections
@@ -170,6 +181,14 @@ describe("Connection", () => {
       async cancel(_: CancelNotification): Promise<void> {
         // no-op
       }
+      async listCommands(
+        _: ListCommandsRequest,
+      ): Promise<ListCommandsResponse> {
+        throw new Error("not implemented");
+      }
+      async runCommand(_: RunCommandRequest): Promise<void> {
+        throw new Error("not implemented");
+      }
     }
 
     new ClientSideConnection(
@@ -276,6 +295,14 @@ describe("Connection", () => {
       async cancel(params: CancelNotification): Promise<void> {
         messageLog.push(`cancelled called: ${params.sessionId}`);
       }
+      async listCommands(
+        _: ListCommandsRequest,
+      ): Promise<ListCommandsResponse> {
+        throw new Error("not implemented");
+      }
+      async runCommand(_: RunCommandRequest): Promise<void> {
+        throw new Error("not implemented");
+      }
     }
 
     // Set up connections
@@ -407,6 +434,14 @@ describe("Connection", () => {
       async cancel(params: CancelNotification): Promise<void> {
         notificationLog.push(`cancelled: ${params.sessionId}`);
       }
+      async listCommands(
+        _: ListCommandsRequest,
+      ): Promise<ListCommandsResponse> {
+        throw new Error("not implemented");
+      }
+      async runCommand(_: RunCommandRequest): Promise<void> {
+        throw new Error("not implemented");
+      }
     }
 
     // Create shared instances
@@ -506,6 +541,14 @@ describe("Connection", () => {
       async cancel(_: CancelNotification): Promise<void> {
         // no-op
       }
+      async listCommands(
+        _: ListCommandsRequest,
+      ): Promise<ListCommandsResponse> {
+        throw new Error("not implemented");
+      }
+      async runCommand(_: RunCommandRequest): Promise<void> {
+        throw new Error("not implemented");
+      }
     }
 
     const agentConnection = new ClientSideConnection(
diff --git a/typescript/acp.ts b/typescript/acp.ts
@@ -446,6 +446,24 @@ export class ClientSideConnection implements Agent {
       params,
     );
   }
+
+  // todo!()
+  async listCommands(
+    params: schema.ListCommandsRequest,
+  ): Promise<schema.ListCommandsResponse> {
+    return await this.#connection.sendRequest(
+      schema.AGENT_METHODS.session_list_commands,
+      params,
+    );
+  }
+
+  // todo!()
+  async runCommand(params: schema.RunCommandRequest): Promise<void> {
+    return await this.#connection.sendRequest(
+      schema.AGENT_METHODS.session_run_command,
+      params,
+    );
+  }
 }
 
 type AnyMessage = AnyRequest | AnyResponse | AnyNotification;
@@ -814,7 +832,7 @@ export interface Client {
    */
   createTerminal?(
     params: schema.CreateTerminalRequest,
-  ): Promise<schema.CreateTerminalResponse>;
+  ): Promise<TerminalHandle>;
 
   /**
    *  @internal **UNSTABLE**
@@ -934,4 +952,10 @@ export interface Agent {
    * See protocol docs: [Cancellation](https://agentclientprotocol.com/protocol/prompt-turn#cancellation)
    */
   cancel(params: schema.CancelNotification): Promise<void>;
+
+  listCommands(
+    params: schema.ListCommandsRequest,
+  ): Promise<schema.ListCommandsResponse>;
+
+  runCommand(params: schema.RunCommandRequest): Promise<void>;
 }
diff --git a/typescript/schema.ts b/typescript/schema.ts
@@ -2,9 +2,11 @@ export const AGENT_METHODS = {
   authenticate: "authenticate",
   initialize: "initialize",
   session_cancel: "session/cancel",
+  session_list_commands: "session/list_commands",
   session_load: "session/load",
   session_new: "session/new",
   session_prompt: "session/prompt",
+  session_run_command: "session/run_command",
 };
 
 export const CLIENT_METHODS = {
@@ -841,9 +843,9 @@ export interface PromptCapabilities {
    */
   image?: boolean;
   /**
-   * Agent supports custom slash commands via `list_commands` and `run_command`.
+   * Agent supports commands via `list_commands` and `run_command`.
    */
-  supportsCustomCommands?: boolean;
+  supportsCommands?: boolean;
 }
 /**
  * Describes an available authentication method.
@@ -1398,7 +1400,7 @@ export const promptCapabilitiesSchema = z.object({
   audio: z.boolean().optional(),
   embeddedContext: z.boolean().optional(),
   image: z.boolean().optional(),
-  supportsCustomCommands: z.boolean().optional(),
+  supportsCommands: z.boolean().optional(),
 });
 
 /** @internal */
