Skip to content

Commit 91e42cd

Browse files
agu-zagu-z
committed
Rename new_terminal to create_terminal
1 parent 735ad0b commit 91e42cd

10 files changed

Lines changed: 109 additions & 105 deletions

File tree

‎docs/protocol/schema.mdx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -517,10 +517,10 @@ See protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protoc
517517
The actual update content.
518518
</ResponseField>
519519

520-
<a id="terminal-new"></a>
521-
### <span class="font-mono">terminal/new</span>
520+
<a id="terminal-create"></a>
521+
### <span class="font-mono">terminal/create</span>
522522

523-
#### <span class="font-mono">NewTerminalRequest</span>
523+
#### <span class="font-mono">CreateTerminalRequest</span>
524524

525525
**Type:** Object
526526

@@ -542,7 +542,7 @@ See protocol docs: [Agent Reports Output](https://agentclientprotocol.com/protoc
542542
<ResponseField name="sessionId" type={<a href="#sessionid">SessionId</a>} required>
543543
</ResponseField>
544544

545-
#### <span class="font-mono">NewTerminalResponse</span>
545+
#### <span class="font-mono">CreateTerminalResponse</span>
546546

547547
**Type:** Object
548548

‎rust/acp.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ impl Side for ClientSide {
245245
FS_READ_TEXT_FILE_METHOD_NAME => serde_json::from_str(params.get())
246246
.map(AgentRequest::ReadTextFileRequest)
247247
.map_err(Into::into),
248-
TERMINAL_NEW_METHOD_NAME => serde_json::from_str(params.get())
249-
.map(AgentRequest::NewTerminalRequest)
248+
TERMINAL_CREATE_METHOD_NAME => serde_json::from_str(params.get())
249+
.map(AgentRequest::CreateTerminalRequest)
250250
.map_err(Into::into),
251251
TERMINAL_OUTPUT_METHOD_NAME => serde_json::from_str(params.get())
252252
.map(AgentRequest::TerminalOutputRequest)
@@ -291,9 +291,9 @@ impl<T: Client> MessageHandler<ClientSide> for T {
291291
let response = self.read_text_file(args).await?;
292292
Ok(ClientResponse::ReadTextFileResponse(response))
293293
}
294-
AgentRequest::NewTerminalRequest(args) => {
295-
let response = self.new_terminal(args).await?;
296-
Ok(ClientResponse::NewTerminalResponse(response))
294+
AgentRequest::CreateTerminalRequest(args) => {
295+
let response = self.create_terminal(args).await?;
296+
Ok(ClientResponse::CreateTerminalResponse(response))
297297
}
298298
AgentRequest::TerminalOutputRequest(args) => {
299299
let response = self.terminal_output(args).await?;
@@ -411,14 +411,14 @@ impl Client for AgentSideConnection {
411411
.await
412412
}
413413

414-
async fn new_terminal(
414+
async fn create_terminal(
415415
&self,
416-
arguments: NewTerminalRequest,
417-
) -> Result<NewTerminalResponse, Error> {
416+
arguments: CreateTerminalRequest,
417+
) -> Result<CreateTerminalResponse, Error> {
418418
self.conn
419419
.request(
420-
TERMINAL_NEW_METHOD_NAME,
421-
Some(AgentRequest::NewTerminalRequest(arguments)),
420+
TERMINAL_CREATE_METHOD_NAME,
421+
Some(AgentRequest::CreateTerminalRequest(arguments)),
422422
)
423423
.await
424424
}

‎rust/client.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ pub trait Client {
5454
args: ReadTextFileRequest,
5555
) -> impl Future<Output = Result<ReadTextFileResponse, Error>>;
5656

57-
fn new_terminal(
57+
fn create_terminal(
5858
&self,
59-
args: NewTerminalRequest,
60-
) -> impl Future<Output = Result<NewTerminalResponse, Error>>;
59+
args: CreateTerminalRequest,
60+
) -> impl Future<Output = Result<CreateTerminalResponse, Error>>;
6161

6262
fn terminal_output(
6363
&self,
@@ -277,9 +277,9 @@ impl std::fmt::Display for TerminalId {
277277
}
278278

279279
#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
280-
#[schemars(extend("x-side" = "client", "x-method" = "terminal/new"))]
280+
#[schemars(extend("x-side" = "client", "x-method" = "terminal/create"))]
281281
#[serde(rename_all = "camelCase")]
282-
pub struct NewTerminalRequest {
282+
pub struct CreateTerminalRequest {
283283
pub session_id: SessionId,
284284
pub command: String,
285285
#[serde(default, skip_serializing_if = "Vec::is_empty")]
@@ -293,9 +293,9 @@ pub struct NewTerminalRequest {
293293
}
294294

295295
#[derive(Debug, Clone, Serialize, Deserialize, JsonSchema)]
296-
#[schemars(extend("x-side" = "client", "x-method" = "terminal/new"))]
296+
#[schemars(extend("x-side" = "client", "x-method" = "terminal/create"))]
297297
#[serde(rename_all = "camelCase")]
298-
pub struct NewTerminalResponse {
298+
pub struct CreateTerminalResponse {
299299
pub terminal_id: TerminalId,
300300
}
301301

@@ -396,7 +396,7 @@ pub struct ClientMethodNames {
396396
/// Method for reading text files.
397397
pub fs_read_text_file: &'static str,
398398
/// Method for creating new terminals.
399-
pub terminal_new: &'static str,
399+
pub terminal_create: &'static str,
400400
/// Method for getting terminals output.
401401
pub terminal_output: &'static str,
402402
/// Method for releasing a terminal.
@@ -411,7 +411,7 @@ pub const CLIENT_METHOD_NAMES: ClientMethodNames = ClientMethodNames {
411411
session_request_permission: SESSION_REQUEST_PERMISSION_METHOD_NAME,
412412
fs_write_text_file: FS_WRITE_TEXT_FILE_METHOD_NAME,
413413
fs_read_text_file: FS_READ_TEXT_FILE_METHOD_NAME,
414-
terminal_new: TERMINAL_NEW_METHOD_NAME,
414+
terminal_create: TERMINAL_CREATE_METHOD_NAME,
415415
terminal_output: TERMINAL_OUTPUT_METHOD_NAME,
416416
terminal_release: TERMINAL_RELEASE_METHOD_NAME,
417417
terminal_wait_for_exit: TERMINAL_WAIT_FOR_EXIT_METHOD_NAME,
@@ -426,7 +426,7 @@ pub(crate) const FS_WRITE_TEXT_FILE_METHOD_NAME: &str = "fs/write_text_file";
426426
/// Method name for reading text files.
427427
pub(crate) const FS_READ_TEXT_FILE_METHOD_NAME: &str = "fs/read_text_file";
428428
/// Method name for creating a new terminal.
429-
pub(crate) const TERMINAL_NEW_METHOD_NAME: &str = "terminal/new";
429+
pub(crate) const TERMINAL_CREATE_METHOD_NAME: &str = "terminal/create";
430430
/// Method for getting terminals output.
431431
pub(crate) const TERMINAL_OUTPUT_METHOD_NAME: &str = "terminal/output";
432432
/// Method for releasing a terminal.
@@ -447,7 +447,7 @@ pub enum AgentRequest {
447447
WriteTextFileRequest(WriteTextFileRequest),
448448
ReadTextFileRequest(ReadTextFileRequest),
449449
RequestPermissionRequest(RequestPermissionRequest),
450-
NewTerminalRequest(NewTerminalRequest),
450+
CreateTerminalRequest(CreateTerminalRequest),
451451
TerminalOutputRequest(TerminalOutputRequest),
452452
ReleaseTerminalRequest(ReleaseTerminalRequest),
453453
WaitForTerminalExitRequest(WaitForTerminalExitRequest),
@@ -466,7 +466,7 @@ pub enum ClientResponse {
466466
WriteTextFileResponse,
467467
ReadTextFileResponse(ReadTextFileResponse),
468468
RequestPermissionResponse(RequestPermissionResponse),
469-
NewTerminalResponse(NewTerminalResponse),
469+
CreateTerminalResponse(CreateTerminalResponse),
470470
TerminalOutputResponse(TerminalOutputResponse),
471471
ReleaseTerminalResponse,
472472
WaitForTerminalExitResponse(WaitForTerminalExitResponse),

‎rust/example_client.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ impl acp::Client for ExampleClient {
4040
Err(acp::Error::method_not_found())
4141
}
4242

43-
async fn new_terminal(
43+
async fn create_terminal(
4444
&self,
45-
_args: acp::NewTerminalRequest,
46-
) -> anyhow::Result<acp::NewTerminalResponse, acp::Error> {
45+
_args: acp::CreateTerminalRequest,
46+
) -> Result<acp::CreateTerminalResponse, acp::Error> {
4747
Err(acp::Error::method_not_found())
4848
}
4949

‎rust/markdown_generator.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ impl SideDocs {
644644
"fs/write_text_file" => self.client_methods.get("write_text_file").unwrap(),
645645
"fs/read_text_file" => self.client_methods.get("read_text_file").unwrap(),
646646
"session/update" => self.client_methods.get("session_notification").unwrap(),
647-
"terminal/new" => self.client_methods.get("new_terminal").unwrap(),
647+
"terminal/create" => self.client_methods.get("create_terminal").unwrap(),
648648
"terminal/output" => self.client_methods.get("terminal_output").unwrap(),
649649
"terminal/release" => self.client_methods.get("release_terminal").unwrap(),
650650
"terminal/wait_for_exit" => self.client_methods.get("wait_for_terminal_exit").unwrap(),

‎rust/rpc_tests.rs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ impl Client for TestClient {
6868
Ok(())
6969
}
7070

71-
async fn new_terminal(&self, _args: NewTerminalRequest) -> Result<NewTerminalResponse, Error> {
71+
async fn create_terminal(
72+
&self,
73+
_args: CreateTerminalRequest,
74+
) -> Result<CreateTerminalResponse, Error> {
7275
unimplemented!()
7376
}
7477

‎schema/meta.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"fs_write_text_file": "fs/write_text_file",
1313
"session_request_permission": "session/request_permission",
1414
"session_update": "session/update",
15-
"terminal_new": "terminal/new",
15+
"terminal_create": "terminal/create",
1616
"terminal_output": "terminal/output",
1717
"terminal_release": "terminal/release",
1818
"terminal_wait_for_exit": "terminal/wait_for_exit"

‎schema/schema.json‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
"title": "RequestPermissionRequest"
4646
},
4747
{
48-
"$ref": "#/$defs/NewTerminalRequest",
49-
"title": "NewTerminalRequest"
48+
"$ref": "#/$defs/CreateTerminalRequest",
49+
"title": "CreateTerminalRequest"
5050
},
5151
{
5252
"$ref": "#/$defs/TerminalOutputRequest",
@@ -266,8 +266,8 @@
266266
"title": "RequestPermissionResponse"
267267
},
268268
{
269-
"$ref": "#/$defs/NewTerminalResponse",
270-
"title": "NewTerminalResponse"
269+
"$ref": "#/$defs/CreateTerminalResponse",
270+
"title": "CreateTerminalResponse"
271271
},
272272
{
273273
"$ref": "#/$defs/TerminalOutputResponse",
@@ -435,6 +435,51 @@
435435
}
436436
]
437437
},
438+
"CreateTerminalRequest": {
439+
"properties": {
440+
"args": {
441+
"items": {
442+
"type": "string"
443+
},
444+
"type": "array"
445+
},
446+
"command": {
447+
"type": "string"
448+
},
449+
"cwd": {
450+
"type": ["string", "null"]
451+
},
452+
"env": {
453+
"items": {
454+
"$ref": "#/$defs/EnvVariable"
455+
},
456+
"type": "array"
457+
},
458+
"outputByteLimit": {
459+
"format": "uint64",
460+
"minimum": 0,
461+
"type": ["integer", "null"]
462+
},
463+
"sessionId": {
464+
"$ref": "#/$defs/SessionId"
465+
}
466+
},
467+
"required": ["sessionId", "command"],
468+
"type": "object",
469+
"x-method": "terminal/create",
470+
"x-side": "client"
471+
},
472+
"CreateTerminalResponse": {
473+
"properties": {
474+
"terminalId": {
475+
"type": "string"
476+
}
477+
},
478+
"required": ["terminalId"],
479+
"type": "object",
480+
"x-method": "terminal/create",
481+
"x-side": "client"
482+
},
438483
"EmbeddedResource": {
439484
"description": "The contents of a resource, embedded into a prompt or tool call result.",
440485
"properties": {
@@ -668,51 +713,6 @@
668713
"x-method": "session/new",
669714
"x-side": "agent"
670715
},
671-
"NewTerminalRequest": {
672-
"properties": {
673-
"args": {
674-
"items": {
675-
"type": "string"
676-
},
677-
"type": "array"
678-
},
679-
"command": {
680-
"type": "string"
681-
},
682-
"cwd": {
683-
"type": ["string", "null"]
684-
},
685-
"env": {
686-
"items": {
687-
"$ref": "#/$defs/EnvVariable"
688-
},
689-
"type": "array"
690-
},
691-
"outputByteLimit": {
692-
"format": "uint64",
693-
"minimum": 0,
694-
"type": ["integer", "null"]
695-
},
696-
"sessionId": {
697-
"$ref": "#/$defs/SessionId"
698-
}
699-
},
700-
"required": ["sessionId", "command"],
701-
"type": "object",
702-
"x-method": "terminal/new",
703-
"x-side": "client"
704-
},
705-
"NewTerminalResponse": {
706-
"properties": {
707-
"terminalId": {
708-
"type": "string"
709-
}
710-
},
711-
"required": ["terminalId"],
712-
"type": "object",
713-
"x-method": "terminal/new",
714-
"x-side": "client"
715-
},
716716
"PermissionOption": {
717717
"description": "An option presented to the user when requesting permission.",
718718
"properties": {

‎typescript/acp.ts‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ export class AgentSideConnection implements Client {
147147
*
148148
* See protocol docs: [Client](https://agentclientprotocol.com/protocol/overview#client)
149149
*/
150-
async newTerminal(
151-
params: schema.NewTerminalRequest,
152-
): Promise<schema.NewTerminalResponse> {
150+
async createTerminal(
151+
params: schema.CreateTerminalRequest,
152+
): Promise<schema.CreateTerminalResponse> {
153153
return await this.#connection.sendRequest(
154-
schema.CLIENT_METHODS.terminal_new,
154+
schema.CLIENT_METHODS.terminal_create,
155155
params,
156156
);
157157
}
@@ -272,10 +272,11 @@ export class ClientSideConnection implements Agent {
272272
validatedParams as schema.SessionNotification,
273273
);
274274
}
275-
case schema.CLIENT_METHODS.terminal_new: {
276-
const validatedParams = schema.newTerminalRequestSchema.parse(params);
277-
return client.newTerminal(
278-
validatedParams as schema.NewTerminalRequest,
275+
case schema.CLIENT_METHODS.terminal_create: {
276+
const validatedParams =
277+
schema.createTerminalRequestSchema.parse(params);
278+
return client.createTerminal(
279+
validatedParams as schema.CreateTerminalRequest,
279280
);
280281
}
281282
case schema.CLIENT_METHODS.terminal_output: {
@@ -458,11 +459,11 @@ type AnyError = {
458459

459460
type Result<T> =
460461
| {
461-
result: T;
462-
}
462+
result: T;
463+
}
463464
| {
464-
error: ErrorResponse;
465-
};
465+
error: ErrorResponse;
466+
};
466467

467468
type ErrorResponse = {
468469
code: number;
@@ -787,9 +788,9 @@ export interface Client {
787788
*
788789
* See protocol docs: [Client](https://agentclientprotocol.com/protocol/overview#client)
789790
*/
790-
newTerminal(
791-
params: schema.NewTerminalRequest,
792-
): Promise<schema.NewTerminalResponse>;
791+
createTerminal(
792+
params: schema.CreateTerminalRequest,
793+
): Promise<schema.CreateTerminalResponse>;
793794
/**
794795
* Retrieves output from a previously created terminal.
795796
*

0 commit comments

Comments
 (0)